Merge branch 'main' into build-rs

Qiskit · Sep 19, 2024 · be38d3d · be38d3d
2 parents 09aa7f1 + 5766d7c
commit be38d3d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -70,6 +70,11 @@ jobs:
  python-version: 3.8
  platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
  msrv: "MSRV"
+ # Test future versions of Rust and Python
+ - rust: beta
+ python-version: "3.13-dev"
+ platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
+ msrv: "Beta"
  # Exclude python 3.8 and 3.9 on arm64 until actions/setup-python#808 is resolved
  exclude:
  - platform: {os: "macOS-14", python-architecture: "arm64", rust-target: "aarch64-apple-darwin" }

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/constraints.txt b/constraints.txt
@@ -1,4 +1,4 @@
 decorator==4.4.2
 importlib-metadata==4.13.0;python_version<'3.8'
-pillow<10.0.0
+pillow<10.0.0;python_version<'3.13'
 lxml==5.1.1