Merge pull request #1024 from CQCL/release/1.20.0

Release/1.20.0

.github/workflows/build_and_test.yml

@@ -189,17 +189,15 @@ jobs:
           restore-keys: |
             tket-static-${{ matrix.os }}-
       - name: Build tket
-        # On windows use install + build so build directory is consistent across runs (i.e. don't build from conan cache)
+        # On windows use build + export-pkg so build directory is consistent across runs (i.e. don't build from conan cache)
         # Necessary because setting ccache base_dir doesn't currently work on windows
         run: |
-          conan install tket --user=tket --channel=stable -o boost/*:header_only=True -o with_all_tests=True -c tools.cmake.cmaketoolchain:generator=Ninja
           conan build tket --user=tket --channel=stable -o boost/*:header_only=True -o with_all_tests=True -c tools.cmake.cmaketoolchain:generator=Ninja
           conan export-pkg tket --user=tket --channel=stable -o boost/*:header_only=True -o with_all_tests=True -c tools.cmake.cmaketoolchain:generator=Ninja
       - name: Upload package
         if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
         run: |
           ccache --set-config namespace=WITHOUT_TESTS
-          conan install tket --user=tket --channel=stable -o boost/*:header_only=True
           conan build tket --user=tket --channel=stable -o boost/*:header_only=True
           conan export-pkg tket --user=tket --channel=stable -o boost/*:header_only=True
           conan remote login -p ${{ secrets.JFROG_ARTIFACTORY_TOKEN_3 }} tket-libs ${{ secrets.JFROG_ARTIFACTORY_USER_3 }}

.github/workflows/coverage.yml

@@ -57,8 +57,7 @@ jobs:
         ccache -p
     - name: Build tket
       run: |
-        conan install tket --user=tket --channel=stable -s build_type=Debug --build=missing -o boost/*:header_only=True -o tket/*:profile_coverage=True -o with_test=True -of build/tket
-        conan build tket --user=tket --channel=stable -s build_type=Debug -o boost/*:header_only=True -o tket/*:profile_coverage=True  -o with_test=True -o test-tket/*:with_coverage=True -of build/tket
+        conan build tket --user=tket --channel=stable -s build_type=Debug --build=missing -o boost/*:header_only=True -o tket/*:profile_coverage=True  -o with_test=True -o test-tket/*:with_coverage=True -of build/tket
         conan export-pkg tket --user=tket --channel=stable -s build_type=Debug -o boost/*:header_only=True -o tket/*:profile_coverage=True -o with_test=True -of build/tket -tf ""
     - name: Install runtime test requirements
       if: github.event_name == 'schedule'

.github/workflows/test_libs.yml

@@ -133,12 +133,10 @@ jobs:
       run: conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
     - name: build ${{ matrix.lib }}
       run: |
-        conan install libs/${{ matrix.lib }} -s build_type=Debug --build=missing -o boost/*:header_only=True -o ${{ matrix.lib }}/*:profile_coverage=True -of build/${{ matrix.lib }}
-        conan build libs/${{ matrix.lib }} -s build_type=Debug -o boost/*:header_only=True -o ${{ matrix.lib }}/*:profile_coverage=True -of build/${{ matrix.lib }}
+        conan build libs/${{ matrix.lib }} -s build_type=Debug --build=missing -o boost/*:header_only=True -o ${{ matrix.lib }}/*:profile_coverage=True -of build/${{ matrix.lib }}
         conan export-pkg libs/${{ matrix.lib }} -s build_type=Debug -o boost/*:header_only=True -o ${{ matrix.lib }}/*:profile_coverage=True -of build/${{ matrix.lib }} -tf ""
     - name: build ${{ matrix.lib }} tests
       run: |
-        conan install libs/${{ matrix.lib }}/test -s build_type=Debug --build=missing -o boost/*:header_only=True -o test-${{ matrix.lib }}/*:with_coverage=True -of build/${{ matrix.lib }}-tests
         conan build libs/${{ matrix.lib }}/test -s build_type=Debug --build=missing -o boost/*:header_only=True -o test-${{ matrix.lib }}/*:with_coverage=True -of build/${{ matrix.lib }}-tests
     - name: run ${{ matrix.lib }} tests
       working-directory: ./build/${{ matrix.lib }}-tests/build/Debug

libs/README.md

@@ -60,11 +60,8 @@ If using gcc and with gcovr installed (`pip install gcovr`), a test coverage
 report can be generated using the following sequence of commands:
 
 ```shell
-conan install libs/tkxxx -s build_type=Debug --build=missing -o boost/*:header_only=True -o tkxxx/*:profile_coverage=True -of build/tkxxx
-conan build libs/tkxxx -s build_type=Debug -o boost/*:header_only=True -o tkxxx/*:profile_coverage=True -of build/tkxxx
+conan build libs/tkxxx -s build_type=Debug --build=missing -o boost/*:header_only=True -o tkxxx/*:profile_coverage=True -of build/tkxxx
 conan export-pkg libs/tkxxx -s build_type=Debug -o boost/*:header_only=True -o tkxxx/*:profile_coverage=True -of build/tkxxx -tf ""
-
-conan install libs/tkxxx/test -s build_type=Debug --build=missing -o boost/*:header_only=True -o test-tkxxx/*:with_coverage=True -of build/tkxxx-tests
 conan build libs/tkxxx/test -s build_type=Debug --build=missing -o boost/*:header_only=True -o test-tkxxx/*:with_coverage=True -of build/tkxxx-tests
 cd ./build/tkxxx-tests/build/Debug
 ./test-tkxxx

pytket/docs/changelog.rst

@@ -1,14 +1,29 @@
 Changelog
 =========
 
-1.19.1 (September 2023)
+1.20.0 (September 2023)
 -----------------------
 
+Fixes:
+
+* Mixed up function index in wasm file check
+* Fix handling of scratch bits in pytket-to-QASM conversion when the source bit
+  for the scratch is overwritten before the scratch bit is used in a
+  conditional.
+
 Minor new features:
 
 * ``Circuit.add_conditional_barrier``
 * Add ``apply_clifford_basis_change_tensor`` method
 
+API changes:
+
+* barrier changed from MetaOp to be a BarrierOp
+
+
+1.19.1 (September 2023)
+-----------------------
+
 Fixes:
 
 * Fix `RebaseCustom()` rebasing of `TK2` gates.

pytket/docs/conf.py

@@ -38,9 +38,9 @@
 author = "Quantinuum"
 
 # The short X.Y version
-version = "1.19"
+version = "1.20"
 # The full version, including alpha/beta/rc tags
-release = "1.19.1"
+release = "1.20.0"
 
 
 # -- General configuration ---------------------------------------------------

pytket/mypy.ini

@@ -13,7 +13,7 @@ namespace_packages = True
 check_untyped_defs = True
 
 warn_redundant_casts = True
-warn_unused_ignores = False
+warn_unused_ignores = True
 warn_no_return = False
 warn_return_any = True
 warn_unreachable = True
@@ -29,3 +29,7 @@ ignore_errors = True
 [mypy-scipy.*]
 ignore_missing_imports = True
 ignore_errors = True
+
+[mypy-IPython.*]
+ignore_missing_imports = True
+ignore_errors = True

pytket/pytket/circuit/display/__init__.py

@@ -164,12 +164,12 @@ def render_circuit_as_html(
         if jupyter:
             # If we are in a notebook, we can tell jupyter to display the html.
             # We don't import at the top in case we are not in a notebook environment.
-            from IPython.display import (  # type: ignore
+            from IPython.display import (
                 HTML,
                 display,
             )  # pylint: disable=C0415
 
-            display(HTML(html))  # type: ignore
+            display(HTML(html))
             return None
         return html