From f1fded1085c49c81ef32491e0d41e7aea4dcf24d Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:43:05 +0000 Subject: [PATCH 1/9] Update intro.txt --- docs/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/intro.txt b/docs/intro.txt index 06e1d42..e61f9c8 100644 --- a/docs/intro.txt +++ b/docs/intro.txt @@ -4,7 +4,7 @@ pytket-iqm ``pytket-iqm`` is an extension to ``pytket`` that allows ``pytket`` circuits to be executed on IQM's quantum devices and simulators. -``pytket-iqm`` is available for Python 3.9, 3.10 and 3.11, on Linux, MacOS and +``pytket-iqm`` is available for Python 3.10, 3.10 and 3.12, on Linux, MacOS and Windows. To install, run: :: From d692b2d6315a512e9a4915696abf797f53c6ee98 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:43:49 +0000 Subject: [PATCH 2/9] Update intro.txt --- docs/intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/intro.txt b/docs/intro.txt index e61f9c8..e91cfbb 100644 --- a/docs/intro.txt +++ b/docs/intro.txt @@ -4,7 +4,7 @@ pytket-iqm ``pytket-iqm`` is an extension to ``pytket`` that allows ``pytket`` circuits to be executed on IQM's quantum devices and simulators. -``pytket-iqm`` is available for Python 3.10, 3.10 and 3.12, on Linux, MacOS and +``pytket-iqm`` is available for Python 3.10, 3.11 and 3.12, on Linux, MacOS and Windows. To install, run: :: From 04a5a0b4a57eab33d13133d9512b04ecbb50bbee Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:44:09 +0000 Subject: [PATCH 3/9] Update setup.py --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index be9e196..323fece 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ version=metadata["__extension_version__"], author="TKET development team", author_email="tket-support@cambridgequantum.com", - python_requires=">=3.9", + python_requires=">=3.10", project_urls={ "Documentation": "https://tket.quantinuum.com/extensions/pytket-iqm/index.html", "Source": "https://github.com/CQCL/pytket-iqm", @@ -42,12 +42,12 @@ license="Apache 2", packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, - install_requires=["pytket ~= 1.23", "iqm-client ~= 15.2"], + install_requires=["pytket ~= 1.24.0rc0", "iqm-client ~= 15.2"], classifiers=[ "Environment :: Console", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: Apache Software License", "Operating System :: MacOS :: MacOS X", "Operating System :: POSIX :: Linux", From 44df7183eb4dff2d4fbca35235f20d0fc35bcb65 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:44:33 +0000 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4d07bb..025a3e9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ executed on [IQM](https://meetiqm.com/)'s quantum devices and simulators. ## Getting started -`pytket-iqm` is available for Python 3.8, 3.9 and 3.10, on Linux, macOS +`pytket-iqm` is available for Python 3.10, 3.11 and 3.12, on Linux, macOS and Windows. To install, run: ```shell From a3c1127810c1d0ec2787e675cbdb4812517e3db4 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:45:17 +0000 Subject: [PATCH 5/9] Update docs.yml --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ad3ea42..466754c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.10' - name: Upgrade pip and install wheel run: pip install --upgrade pip wheel - name: Install pytket iqm From 2aef202ff160e8111e80d2b48b5ad90fbfbb226b Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:45:50 +0000 Subject: [PATCH 6/9] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c31ae3d..ddf096a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -35,16 +35,6 @@ jobs: with: fetch-depth: '0' - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* - - name: Set up Python 3.9 - if: github.event_name == 'push' || github.event_name == 'schedule' - uses: actions/setup-python@v5 - with: - python-version: '3.9' - - name: Build and test (3.9) - if: github.event_name == 'push' || github.event_name == 'schedule' - shell: bash - run: | - ./.github/workflows/build-test nomypy - name: Set up Python 3.10 uses: actions/setup-python@v5 with: @@ -73,6 +63,16 @@ jobs: shell: bash run: | ./.github/workflows/build-test nomypy + - name: Set up Python 3.12 + if: github.event_name == 'push' || github.event_name == 'schedule' + uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Build and test (3.12) + if: github.event_name == 'push' || github.event_name == 'schedule' + shell: bash + run: | + ./.github/workflows/build-test nomypy - uses: actions/upload-artifact@v4 if: github.event_name == 'release' || contains(github.ref, 'refs/heads/wheel') with: From 4cd835ed8e5f8067024cc9c5dcbf0fa8a43398d2 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:45:44 +0000 Subject: [PATCH 7/9] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 323fece..90f65da 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ license="Apache 2", packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, - install_requires=["pytket ~= 1.24.0rc0", "iqm-client ~= 15.2"], + install_requires=["pytket ~= 1.24", "iqm-client ~= 15.2"], classifiers=[ "Environment :: Console", "Programming Language :: Python :: 3.10", From ae1f114146565d792a4e7b3f3532074d36d90206 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:55:41 +0000 Subject: [PATCH 8/9] Update changelog.rst --- docs/changelog.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 39054ab..366d307 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,14 @@ Changelog ~~~~~~~~~ +Unreleased +---------- + +General: + +* Python 3.12 support added, 3.9 dropped. +* pytket dependency updated to 1.24 + 0.10.0 (January 2024) --------------------- From cb9efaadcb41ddbe56702af4399efff04278ef5f Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:57:08 +0000 Subject: [PATCH 9/9] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ddf096a..07c3015 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,40 +36,40 @@ jobs: fetch-depth: '0' - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* - name: Set up Python 3.10 + if: github.event_name == 'push' || github.event_name == 'schedule' uses: actions/setup-python@v5 with: python-version: '3.10' - - name: Build and test including remote checks (3.10) mypy + - name: Build and test (3.10) + if: github.event_name == 'push' || github.event_name == 'schedule' + shell: bash + run: | + ./.github/workflows/build-test nomypy + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: '3.11' + - name: Build and test including remote checks (3.11) mypy shell: bash if: (matrix.os == 'macos-12') && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'release' || github.event_name == 'schedule' ) run: | ./.github/workflows/build-test mypy env: PYTKET_RUN_REMOTE_TESTS: 1 - - name: Build and test including remote checks (3.10) nomypy + - name: Build and test including remote checks (3.11) nomypy if: (matrix.os != 'macos-12') && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'release' || github.event_name == 'schedule') shell: bash run: | ./.github/workflows/build-test nomypy env: PYTKET_RUN_REMOTE_TESTS: 1 - - name: Set up Python 3.11 - if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Build and test (3.11) - if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' - shell: bash - run: | - ./.github/workflows/build-test nomypy - name: Set up Python 3.12 - if: github.event_name == 'push' || github.event_name == 'schedule' + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' uses: actions/setup-python@v5 with: python-version: '3.12' - name: Build and test (3.12) - if: github.event_name == 'push' || github.event_name == 'schedule' + if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' shell: bash run: | ./.github/workflows/build-test nomypy @@ -122,10 +122,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: '0' - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - name: Download all wheels uses: actions/download-artifact@v4 with: