From 3c5184f417e37a36125cac5535af0d2aa5846015 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:55:11 +0000 Subject: [PATCH 1/5] Update to python 3.12 --- .github/workflows/build_and_test.yml | 20 ++++++++++---------- .github/workflows/docs.yml | 4 ++-- README.md | 2 +- docs/intro.txt | 2 +- setup.py | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 1a55ad9..c9a47d1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -35,16 +35,6 @@ jobs: run: | docker pull rigetti/quilc docker pull rigetti/qvm - - 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: @@ -69,6 +59,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: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e10ca09..eaa8047 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 pyquil diff --git a/README.md b/README.md index fff0122..ccd9e05 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ representations. ## Getting started -`pytket-pyquil` is available for Python 3.9, 3.10 and 3.11, on Linux, MacOS +`pytket-pyquil` is available for Python 3.10, 3.11 and 3.12, on Linux, MacOS and Windows. To install, run: ```shell diff --git a/docs/intro.txt b/docs/intro.txt index 8458783..31e54f0 100644 --- a/docs/intro.txt +++ b/docs/intro.txt @@ -8,7 +8,7 @@ programs in the Quil language and running them on the Forest platform. run on Rigetti backends and simulators, as well as conversion to and from pyQuil representations. -``pytket-pyquil`` is available for Python 3.9, 3.10 and 3.11, on Linux, MacOS and +``pytket-pyquil`` is available for Python 3.10, 3.11 and 3.12, on Linux, MacOS and Windows. To install, run: :: diff --git a/setup.py b/setup.py index 2888608..42045ed 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.8", + python_requires=">=3.10", project_urls={ "Documentation": "https://tket.quantinuum.com/extensions/pytket-pyquil/index.html", "Source": "https://github.com/CQCL/pytket-pyquil", @@ -44,15 +44,15 @@ packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, install_requires=[ - "pytket ~= 1.23", + "pytket ~= 1.24.0rc0", "pyquil ~= 3.5", "typing-extensions ~= 4.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 c2b5e2c9372c5a4cc6b327443eb449dcccc24d47 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:32:17 +0000 Subject: [PATCH 2/5] Update to python 3.12 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 42045ed..dc80c7d 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, install_requires=[ - "pytket ~= 1.24.0rc0", + "pytket ~= 1.24.0", "pyquil ~= 3.5", "typing-extensions ~= 4.2", ], From 99b2304f0fc63199aa849dd2bf1ea77042ebcbd3 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:01:08 +0000 Subject: [PATCH 3/5] Update changelog.rst --- docs/changelog.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 91a5e8c..748e804 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.32.0 (January 2024) --------------------- From 45cce822266342c30a51da4f5e5f5a5390f136f1 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:01:44 +0000 Subject: [PATCH 4/5] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c9a47d1..d8f58df 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,42 +30,42 @@ 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.10 + if: github.event_name == 'push' || github.event_name == 'schedule' + uses: actions/setup-python@v5 + with: + python-version: '3.10' + - name: Build and test (3.10) + if: github.event_name == 'push' || github.event_name == 'schedule' + shell: bash + run: | + ./.github/workflows/build-test nomypy - name: Pull docker images if: ${{ matrix.os == 'ubuntu-22.04' }} run: | docker pull rigetti/quilc docker pull rigetti/qvm - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.10' - - name: Build and test including remote checks (3.10) mypy + python-version: '3.11' + - name: Build and test including remote checks (3.11) mypy 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 mypy - - 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 - - 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 @@ -119,10 +119,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: From 25777e551af740115d560338b125dfd251e6f0e6 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:44:50 +0000 Subject: [PATCH 5/5] Update setup.py Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dc80c7d..de1fdad 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, install_requires=[ - "pytket ~= 1.24.0", + "pytket ~= 1.24", "pyquil ~= 3.5", "typing-extensions ~= 4.2", ],