From 07d5ab5db2c74755bb3b57e02fea5eea5232a689 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:21:17 +0100 Subject: [PATCH 1/7] Bump actions/deploy-pages from 4.0.4 to 4.0.5 (#93) Bumps [actions/deploy-pages](https://github.com/actions/deploy-pages) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/actions/deploy-pages/releases) - [Commits](https://github.com/actions/deploy-pages/compare/v4.0.4...v4.0.5) --- updated-dependencies: - dependency-name: actions/deploy-pages dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee300fe..d4d5e7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,4 +115,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4.0.4 + uses: actions/deploy-pages@v4.0.5 From 8ff069542742c57b7fd450c7a6f1a8e1810ce03e Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:32:12 +0100 Subject: [PATCH 2/7] remove copyright from documentation (#96) * remove copyright from documentation * update copyright notice --- docs/build-docs | 2 -- docs/conf.py | 2 +- pytket/extensions/aqt/__init__.py | 2 +- pytket/extensions/aqt/backends/__init__.py | 2 +- pytket/extensions/aqt/backends/aqt.py | 2 +- pytket/extensions/aqt/backends/aqt_multi_zone.py | 2 +- pytket/extensions/aqt/backends/config.py | 2 +- pytket/extensions/aqt/extension_version.py | 2 +- pytket/extensions/aqt/multi_zone_architecture/__init__.py | 2 +- pytket/extensions/aqt/multi_zone_architecture/architecture.py | 2 +- .../extensions/aqt/multi_zone_architecture/circuit/__init__.py | 2 +- .../aqt/multi_zone_architecture/circuit/multizone_circuit.py | 2 +- .../aqt/multi_zone_architecture/circuit_routing/__init__.py | 2 +- .../aqt/multi_zone_architecture/macro_architecture_graph.py | 2 +- .../aqt/multi_zone_architecture/named_architectures.py | 2 +- tests/backend_test.py | 2 +- tests/convert_test.py | 2 +- tests/multi_zone/architecture_test.py | 2 +- tests/multi_zone/multi_zone_backend_test.py | 2 +- tests/multi_zone/multi_zone_circuit_test.py | 2 +- tests/multi_zone/zone_types_test.py | 2 +- 21 files changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/build-docs b/docs/build-docs index f62020a..786d462 100755 --- a/docs/build-docs +++ b/docs/build-docs @@ -67,8 +67,6 @@ def build_module_docs() -> None: "-D", f"project=pytket-{MODULE}", "-D", - f"copyright={datetime.date.today().year} Cambridge Quantum Computing", - "-D", f"version={'.'.join(v[:2])}", "-D", f"release={'.'.join(v)}", diff --git a/docs/conf.py b/docs/conf.py index 8bdce1e..b940db7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,7 +16,7 @@ # Configuration file for the Sphinx documentation builder. # See https://www.sphinx-doc.org/en/master/usage/configuration.html -author = "Cambridge Quantum Computing Ltd" +author = "Quantinuum" extensions = [ "sphinx.ext.autodoc", diff --git a/pytket/extensions/aqt/__init__.py b/pytket/extensions/aqt/__init__.py index f694613..da214fd 100644 --- a/pytket/extensions/aqt/__init__.py +++ b/pytket/extensions/aqt/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/backends/__init__.py b/pytket/extensions/aqt/backends/__init__.py index 43ea719..bd1ed2c 100644 --- a/pytket/extensions/aqt/backends/__init__.py +++ b/pytket/extensions/aqt/backends/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/backends/aqt.py b/pytket/extensions/aqt/backends/aqt.py index 3d9cc10..f987214 100644 --- a/pytket/extensions/aqt/backends/aqt.py +++ b/pytket/extensions/aqt/backends/aqt.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/backends/aqt_multi_zone.py b/pytket/extensions/aqt/backends/aqt_multi_zone.py index 522b4eb..3c88cf4 100644 --- a/pytket/extensions/aqt/backends/aqt_multi_zone.py +++ b/pytket/extensions/aqt/backends/aqt_multi_zone.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/backends/config.py b/pytket/extensions/aqt/backends/config.py index 06a7372..2571264 100644 --- a/pytket/extensions/aqt/backends/config.py +++ b/pytket/extensions/aqt/backends/config.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/extension_version.py b/pytket/extensions/aqt/extension_version.py index 0c45dc6..4fc2cb0 100644 --- a/pytket/extensions/aqt/extension_version.py +++ b/pytket/extensions/aqt/extension_version.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/__init__.py b/pytket/extensions/aqt/multi_zone_architecture/__init__.py index 196196c..0f86637 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/__init__.py +++ b/pytket/extensions/aqt/multi_zone_architecture/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/architecture.py b/pytket/extensions/aqt/multi_zone_architecture/architecture.py index da54ca4..a285acb 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/architecture.py +++ b/pytket/extensions/aqt/multi_zone_architecture/architecture.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/circuit/__init__.py b/pytket/extensions/aqt/multi_zone_architecture/circuit/__init__.py index 196196c..0f86637 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/circuit/__init__.py +++ b/pytket/extensions/aqt/multi_zone_architecture/circuit/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/circuit/multizone_circuit.py b/pytket/extensions/aqt/multi_zone_architecture/circuit/multizone_circuit.py index 8512476..41bb96d 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/circuit/multizone_circuit.py +++ b/pytket/extensions/aqt/multi_zone_architecture/circuit/multizone_circuit.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/circuit_routing/__init__.py b/pytket/extensions/aqt/multi_zone_architecture/circuit_routing/__init__.py index 196196c..0f86637 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/circuit_routing/__init__.py +++ b/pytket/extensions/aqt/multi_zone_architecture/circuit_routing/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/macro_architecture_graph.py b/pytket/extensions/aqt/multi_zone_architecture/macro_architecture_graph.py index 243a12d..ac0f1da 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/macro_architecture_graph.py +++ b/pytket/extensions/aqt/multi_zone_architecture/macro_architecture_graph.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pytket/extensions/aqt/multi_zone_architecture/named_architectures.py b/pytket/extensions/aqt/multi_zone_architecture/named_architectures.py index 4f039ba..18839b5 100644 --- a/pytket/extensions/aqt/multi_zone_architecture/named_architectures.py +++ b/pytket/extensions/aqt/multi_zone_architecture/named_architectures.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/backend_test.py b/tests/backend_test.py index b11ddbd..97d4ced 100644 --- a/tests/backend_test.py +++ b/tests/backend_test.py @@ -1,4 +1,4 @@ -# Copyright 2019-2024 Cambridge Quantum Computing +# Copyright 2019-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/convert_test.py b/tests/convert_test.py index 0b7b6cd..00372ca 100644 --- a/tests/convert_test.py +++ b/tests/convert_test.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/multi_zone/architecture_test.py b/tests/multi_zone/architecture_test.py index b3b5da6..859fe3d 100644 --- a/tests/multi_zone/architecture_test.py +++ b/tests/multi_zone/architecture_test.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/multi_zone/multi_zone_backend_test.py b/tests/multi_zone/multi_zone_backend_test.py index dac4cf6..cba8fb7 100644 --- a/tests/multi_zone/multi_zone_backend_test.py +++ b/tests/multi_zone/multi_zone_backend_test.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/multi_zone/multi_zone_circuit_test.py b/tests/multi_zone/multi_zone_circuit_test.py index 0717bb0..f745f66 100644 --- a/tests/multi_zone/multi_zone_circuit_test.py +++ b/tests/multi_zone/multi_zone_circuit_test.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/multi_zone/zone_types_test.py b/tests/multi_zone/zone_types_test.py index 8d81b84..6e2dccd 100644 --- a/tests/multi_zone/zone_types_test.py +++ b/tests/multi_zone/zone_types_test.py @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Cambridge Quantum Computing +# Copyright 2020-2024 Quantinuum # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 733aff2a5e2ff2e6c00c883a88c2c949d17f7427 Mon Sep 17 00:00:00 2001 From: Travis Thompson <102229498+trvto@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:08:33 +0200 Subject: [PATCH 3/7] Use ${{github.workspace}} in constraint file path (#97) * use github workspace var * also fix in release.yml * try different way to import --- .github/workflows/nox-session.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- docs/build-docs | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nox-session.yml b/.github/workflows/nox-session.yml index bff14e5..d56c9b3 100644 --- a/.github/workflows/nox-session.yml +++ b/.github/workflows/nox-session.yml @@ -92,12 +92,12 @@ jobs: - name: Install Poetry run: | - pipx install --pip-args=--constraint=dev-tool-requirements.txt poetry + pipx install --pip-args=--constraint=${{ github.workspace }}/dev-tool-requirements.txt poetry poetry --version - name: Install Nox run: | - pipx install --pip-args=--constraint=dev-tool-requirements.txt nox + pipx install --pip-args=--constraint=${{ github.workspace }}/dev-tool-requirements.txt nox nox --version - name: Compute pre-commit cache key diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4d5e7f..0b1a41c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,12 +51,12 @@ jobs: - name: Install Poetry run: | - pipx install --pip-args=--constraint=dev-tool-requirements.txt poetry + pipx install --pip-args=--constraint=${{ github.workspace }}/dev-tool-requirements.txt poetry poetry --version - name: Install Nox run: | - pipx install --pip-args=--constraint=dev-tool-requirements.txt nox + pipx install --pip-args=--constraint=${{ github.workspace }}/dev-tool-requirements.txt nox nox --version - name: Build wheel diff --git a/docs/build-docs b/docs/build-docs index 786d462..772e12a 100755 --- a/docs/build-docs +++ b/docs/build-docs @@ -1,6 +1,6 @@ #!/usr/bin/env python import argparse -import datetime +from datetime import date import shutil import subprocess import sys @@ -67,6 +67,8 @@ def build_module_docs() -> None: "-D", f"project=pytket-{MODULE}", "-D", + f"copyright={date.today().year} Cambridge Quantum Computing", + "-D", f"version={'.'.join(v[:2])}", "-D", f"release={'.'.join(v)}", From 66c49b930c4f332a5f3c5d815a72591f7ec79077 Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Tue, 14 May 2024 17:08:07 +0100 Subject: [PATCH 4/7] update tket email (#99) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0ffae16..96bc2b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "pytket-aqt" version = "0.33.0" description = "Extension for pytket, providing access to AQT backends" -authors = ["TKET development team "] +authors = ["TKET development team "] license = "Apache 2" readme = "README.md" packages = [{include = "pytket"}] From 2ceb8afaaf794496ae296c9049fec578761acb06 Mon Sep 17 00:00:00 2001 From: Alec Edgington <54802828+cqc-alec@users.noreply.github.com> Date: Tue, 21 May 2024 11:41:38 +0100 Subject: [PATCH 5/7] Fix handling of `simplify_initial` kwarg in `process_circuits()` (#101) --- docs/changelog.rst | 5 +++++ pytket/extensions/aqt/backends/aqt.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 9a379e4..d2575cd 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Changelog ~~~~~~~~~ +Unreleased +---------- + +* Fix handling of ``simplify_initial`` kwarg in ``process_circuits()``. + 0.33.0 (March 2024) ------------------- diff --git a/pytket/extensions/aqt/backends/aqt.py b/pytket/extensions/aqt/backends/aqt.py index f987214..e0441fa 100644 --- a/pytket/extensions/aqt/backends/aqt.py +++ b/pytket/extensions/aqt/backends/aqt.py @@ -263,7 +263,7 @@ def process_circuits( self._check_all_circuits(circuits) postprocess = kwargs.get("postprocess", False) - simplify_initial = kwargs.get("postprocess", False) + simplify_initial = kwargs.get("simplify_initial", False) handles = [] for i, (c, n_shots) in enumerate(zip(circuits, n_shots_list)): From c07acedfc887fd9d49317c166ee046b1b4d0d317 Mon Sep 17 00:00:00 2001 From: Alec Edgington <54802828+cqc-alec@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:25:31 +0100 Subject: [PATCH 6/7] Add new issues to project, not Jira (#100) --- .github/workflows/issue-to-project.yml | 16 +++++++++++++ .github/workflows/issue.yml | 33 -------------------------- 2 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/issue-to-project.yml delete mode 100644 .github/workflows/issue.yml diff --git a/.github/workflows/issue-to-project.yml b/.github/workflows/issue-to-project.yml new file mode 100644 index 0000000..f55a9f0 --- /dev/null +++ b/.github/workflows/issue-to-project.yml @@ -0,0 +1,16 @@ +name: Add issues to project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v1.0.1 + with: + project-url: https://github.com/orgs/CQCL-DEV/projects/19 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml deleted file mode 100644 index 1f720e2..0000000 --- a/.github/workflows/issue.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: New issue - -on: - issues: - types: [opened] - -jobs: - jira_task: - name: Create Jira issue - runs-on: ubuntu-22.04 - steps: - - name: Login - uses: atlassian/gajira-login@v3.0.1 - env: - JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} - JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} - JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - - name: Create Bug - uses: atlassian/gajira-create@v3.0.1 - if: contains(github.event.issue.labels.*.name, 'bug') - with: - project: TKET - issuetype: Bug - summary: « [pytket-aqt] ${{ github.event.issue.title }}» - description: ${{ github.event.issue.html_url }} - - name: Create Task - uses: atlassian/gajira-create@v3.0.1 - if: "! contains(github.event.issue.labels.*.name, 'bug')" - with: - project: TKET - issuetype: Task - summary: « [pytket-aqt] ${{ github.event.issue.title }}» - description: ${{ github.event.issue.html_url }} From 8d8ab084eea5f0dd6b99968dca02e382a97ab2f8 Mon Sep 17 00:00:00 2001 From: Alec Edgington Date: Thu, 6 Jun 2024 12:28:30 +0100 Subject: [PATCH 7/7] mainonly --- .github/workflows/release.yml | 2 -- .github/workflows/tests.yml | 3 +-- README.md | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b1a41c..8491502 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,12 +5,10 @@ on: workflow_dispatch: push: branches: - - develop - main pull_request: branches: - main - - develop release: types: - created diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a150b7..dc9b57e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,12 +5,11 @@ on: workflow_dispatch: push: branches: - - develop + - main - "runci/**" pull_request: branches: - main - - develop schedule: # 04:00 every Tuesday morning - cron: "0 4 * * 2" diff --git a/README.md b/README.md index 31ab074..7af6e90 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ exit ## Contributing Pull requests are welcome. To make a PR, first fork the repo, make your proposed -changes on the `develop` branch, and open a PR from your fork. If it passes +changes on the `main` branch, and open a PR from your fork. If it passes tests and is accepted after review, it will be merged in. ### Code style