Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #510: third-party licenses #511

Merged
merged 14 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ crates/python/tests/__output__/

# unversioned developer notes
scratch/

# un-consolidated updates to THIRDPARTY license data
/THIRDPARTY-update.yaml
BatmanAoD marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "qcs"
description = "High level interface for running Quil on a QPU"
version = "0.25.2"
version = "0.25.3-rc.4"
edition = "2018"
license = "Apache-2.0"
repository = "https://github.com/rigetti/qcs-sdk-rust"
Expand Down
2 changes: 1 addition & 1 deletion crates/python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "qcs-sdk-python"
description = "Python bindings to qcs-sdk-rust"
version = "0.21.2"
version = "0.21.3-rc.4"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/rigetti/qcs-sdk-rust"
Expand Down
40,868 changes: 40,868 additions & 0 deletions crates/python/THIRDPARTY.yaml

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions crates/python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is the metadata Maturin uploads to PyPI on publish
[project]
name = "qcs-sdk-python"
version = "0.21.2"
version = "0.21.3-rc.4"
description = "Python interface for the QCS Rust SDK"
readme = "README.md"
license = { text = "Apache-2.0" }
Expand All @@ -27,7 +27,8 @@ dependencies = ["quil>=0.11.2", "qcs-api-client-common>=0.10.0"]
features = ["pyo3/extension-module"]
bindings = "pyo3"
compatibility = "linux"
sdist-include = ["README.md"]
include = ["THIRDPARTY.yaml"]
sdist-include = ["README.md", "THIRDPARTY.yaml"]

[project.optional-dependencies]
pyquil = [
Expand Down
12 changes: 2 additions & 10 deletions crates/python/scripts/patch_grpc_web.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""
Appends grpc-web to the project name of both Cargo.toml and pyproject.toml,
and patches the `hyper-proxy` dependency to allow ppc64le wheel builds.
Appends grpc-web to the project name of both Cargo.toml and pyproject.toml.

This is used in CI to prepare grpc-web-specific python artifacts for publishing.
"""
Expand Down Expand Up @@ -29,11 +28,4 @@ def write(f: TextIOWrapper, data):
with open(join(pycrate_path, "Cargo.toml"), "r+") as f:
data = toml.load(f)
data["package"]["name"] = "qcs-sdk-python-grpc-web"
write(f, data)

# Patch the `hyper-proxy` dependency

with open(join(workspace_path, "Cargo.toml"), "r+") as f:
data = toml.load(f)
data["patch"] = {"crates-io": {"hyper-proxy": {"git": "https://github.com/rigetti/hyper-proxy"}}}
write(f, data)
BatmanAoD marked this conversation as resolved.
Show resolved Hide resolved
write(f, data)
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ ignore = [
{ id = "RUSTSEC-2024-0375", reason = "introduced by atty, a transitive dependency of multiple dependencies, with no upgrade path" },
{ id = "RUSTSEC-2024-0006", reason = "introduced by shlex, a transitive dependency of bindgen with no upgrade path" },
{ id = "RUSTSEC-2021-0139", reason = "ansi_term is unmaintained, but used by clap" },
{ id = "RUSTSEC-2024-0384", reason = "instant is unmaintained, but used by backoff" },
BatmanAoD marked this conversation as resolved.
Show resolved Hide resolved
]
yanked = "deny"
# If this is true, then cargo deny will use the git executable to fetch advisory database.
Expand Down
245 changes: 245 additions & 0 deletions manual_changes_thirdparty.txt

Large diffs are not rendered by default.

Loading