Merge branch 'Qiskit:main' into rust-compose-trans

raynelfss · Sep 3, 2024 · 68817bf · 68817bf
2 parents 233fd20 + b501db1
commit 68817bf
Show file tree

Hide file tree

Showing 39 changed files with 1,129 additions and 416 deletions.
diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml
@@ -92,8 +92,6 @@ jobs:
             # Build and install both qiskit and qiskit-terra so that any optionals
             # depending on `qiskit` will resolve correctly.
           displayName: "Install Terra directly"
-          env:
-            SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - ${{ if eq(parameters.installOptionals, true) }}:
         - bash: |
@@ -178,8 +176,6 @@ jobs:
             sudo apt-get install -y graphviz pandoc
             image_tests/bin/pip check
           displayName: 'Install dependencies'
-          env:
-            SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
         - bash: |
             echo "##vso[task.setvariable variable=HAVE_VISUAL_TESTS_RUN;]true"

diff --git a/.azure/test-macos.yml b/.azure/test-macos.yml
@@ -48,8 +48,6 @@ jobs:
             # depending on `qiskit` will resolve correctly.
           pip check
         displayName: 'Install dependencies'
-        env:
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - ${{ if eq(parameters.installOptionals, true) }}:
         - bash: |

diff --git a/.azure/test-windows.yml b/.azure/test-windows.yml
@@ -47,8 +47,6 @@ jobs:
           # depending on `qiskit` will resolve correctly.
           pip check
         displayName: 'Install dependencies'
-        env:
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - ${{ if eq(parameters.installOptionals, true) }}:
         - bash: |

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -47,7 +47,6 @@ jobs:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Cinstrument-coverage"
           LLVM_PROFILE_FILE: "qiskit-%p-%m.profraw"
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - name: Generate unittest coverage report
         run: |

diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml
@@ -21,8 +21,6 @@ jobs:
           python -m pip install -U -r requirements-dev.txt -c constraints.txt
           python -m pip install -c constraints.txt -e .
           python -m pip install "qiskit-aer" "z3-solver" "cplex" -c constraints.txt
-        env:
-          SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
       - name: Run all tests including slow
         run: stestr run
         env:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ license = "Apache-2.0"
 # Each crate can add on specific features freely as it inherits.
 [workspace.dependencies]
 bytemuck = "1.17"
-indexmap.version = "2.4.0"
+indexmap.version = "2.5.0"
 hashbrown.version = "0.14.5"
 num-bigint = "0.4"
 num-complex = "0.4"