Merge branch 'develop' into docs/update-moredocs

CQCL · Nov 21, 2023 · 18f8bf1 · 18f8bf1
2 parents 1b47b78 + 6cf0ed5
commit 18f8bf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -396,7 +396,7 @@ jobs:
       if: matrix.os == 'macos-13-xlarge' && (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch')
       run: |
         python${{ matrix.python-version }} -m pip install -U mypy
-        python${{ matrix.python-version }} -m pip install -U pybind11-stubgen
+        python${{ matrix.python-version }} -m pip install pybind11-stubgen==2.3.6 # https://github.com/CQCL/tket/issues/1135
         cd pytket
         ./stub_generation/regenerate_stubs
         git diff --quiet pytket/_tket && echo "Stubs are up-to-date" || exit 1  # fail if stubs change after regeneration

diff --git a/flake.lock b/flake.lock
diff --git a/nix-support/pytket.nix b/nix-support/pytket.nix
@@ -74,10 +74,10 @@ in {
       # these directories aren't copied by setup.py, so we do it manually
       cp -r ${
         ../pytket/pytket/circuit/display/js
-      } $out/lib/python3.10/site-packages/pytket/circuit/display/js;
+      } $out/lib/python${super.python3.pythonVersion}/site-packages/pytket/circuit/display/js;
       cp -r ${
         ../pytket/pytket/circuit/display/static
-      } $out/lib/python3.10/site-packages/pytket/circuit/display/static;
+      } $out/lib/python${super.python3.pythonVersion}/site-packages/pytket/circuit/display/static;
     '';
     checkInputs = with super.python3.pkgs; [
       pytest