From 88420e5a2506d8ff39b46ed861e228356a9d0978 Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:39:02 +0000 Subject: [PATCH 1/6] update copyright 2024 (#64) --- pytket/extensions/pyquil/__init__.py | 2 +- pytket/extensions/pyquil/backends/__init__.py | 2 +- pytket/extensions/pyquil/backends/forest.py | 2 +- pytket/extensions/pyquil/pyquil_convert.py | 2 +- setup.py | 2 +- tests/pyquil_convert_test.py | 2 +- tests/qvm_backend_test.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pytket/extensions/pyquil/__init__.py b/pytket/extensions/pyquil/__init__.py index 9dad67f..2013e32 100644 --- a/pytket/extensions/pyquil/__init__.py +++ b/pytket/extensions/pyquil/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # 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/pyquil/backends/__init__.py b/pytket/extensions/pyquil/backends/__init__.py index f1fa49e..75e1c79 100644 --- a/pytket/extensions/pyquil/backends/__init__.py +++ b/pytket/extensions/pyquil/backends/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # 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/pyquil/backends/forest.py b/pytket/extensions/pyquil/backends/forest.py index 4444cb0..3fc2c8b 100644 --- a/pytket/extensions/pyquil/backends/forest.py +++ b/pytket/extensions/pyquil/backends/forest.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # 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/pyquil/pyquil_convert.py b/pytket/extensions/pyquil/pyquil_convert.py index f1b8ecc..81bdd14 100644 --- a/pytket/extensions/pyquil/pyquil_convert.py +++ b/pytket/extensions/pyquil/pyquil_convert.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # 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/setup.py b/setup.py index 0ecede0..2888608 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Cambridge Quantum Computing +# Copyright 2020-2024 Cambridge Quantum Computing # # 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/pyquil_convert_test.py b/tests/pyquil_convert_test.py index 1870b6e..3066416 100644 --- a/tests/pyquil_convert_test.py +++ b/tests/pyquil_convert_test.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # 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/qvm_backend_test.py b/tests/qvm_backend_test.py index f487b4c..a5862c5 100644 --- a/tests/qvm_backend_test.py +++ b/tests/qvm_backend_test.py @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Cambridge Quantum Computing +# Copyright 2019-2024 Cambridge Quantum Computing # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 6bedc3280c3806542567d16237a5a97519d7696b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:06:59 +0000 Subject: [PATCH 2/6] Bump actions/deploy-pages from 4.0.1 to 4.0.3 (#66) Bumps [actions/deploy-pages](https://github.com/actions/deploy-pages) from 4.0.1 to 4.0.3. - [Release notes](https://github.com/actions/deploy-pages/releases) - [Commits](https://github.com/actions/deploy-pages/compare/v4.0.1...v4.0.3) --- 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/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6deb3e0..1a55ad9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -159,4 +159,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4.0.1 + uses: actions/deploy-pages@v4.0.3 From 5836b0c61b68a5d5ffb7808002c72cda3ed66fde Mon Sep 17 00:00:00 2001 From: cqc-melf <70640934+cqc-melf@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:24:51 +0000 Subject: [PATCH 3/6] update sphinx (#69) --- .github/workflows/docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs/requirements.txt b/.github/workflows/docs/requirements.txt index 3268b4f..e893f3c 100644 --- a/.github/workflows/docs/requirements.txt +++ b/.github/workflows/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx ~= 4.3.2 +sphinx ~= 6.2 sphinx_book_theme >= 1.0.1, <2.0 sphinx-copybutton From 0e8672028ae318b83d6dbd21810003dc6f6e38c0 Mon Sep 17 00:00:00 2001 From: Silas Dilkes <36165522+sjdilkes@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:51:34 +0000 Subject: [PATCH 4/6] Update python support to 3.10, 3.11 and 3.12 (#67) * Update to python 3.12 * Update to python 3.12 * Update changelog.rst * Update build_and_test.yml * Update setup.py Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com> --------- Co-authored-by: cqc-melf <70640934+cqc-melf@users.noreply.github.com> --- .github/workflows/build_and_test.yml | 34 ++++++++++++++-------------- .github/workflows/docs.yml | 4 ++-- README.md | 2 +- docs/changelog.rst | 8 +++++++ docs/intro.txt | 2 +- setup.py | 6 ++--- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 1a55ad9..d8f58df 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,41 +30,41 @@ jobs: with: fetch-depth: '0' - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* - - name: Pull docker images - if: ${{ matrix.os == 'ubuntu-22.04' }} - run: | - docker pull rigetti/quilc - docker pull rigetti/qvm - - name: Set up Python 3.9 + - name: Set up Python 3.10 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) + 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: Set up Python 3.10 + - name: Pull docker images + if: ${{ matrix.os == 'ubuntu-22.04' }} + run: | + docker pull rigetti/quilc + docker pull rigetti/qvm + - 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 + - name: Set up Python 3.12 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) + python-version: '3.12' + - name: Build and test (3.12) if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' shell: bash run: | @@ -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: 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/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) --------------------- 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..de1fdad 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", "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 9983926e4e3e4dadbbc28458a3b9517bb9933df1 Mon Sep 17 00:00:00 2001 From: Melf Date: Tue, 23 Jan 2024 11:31:03 +0000 Subject: [PATCH 5/6] update changelog --- docs/changelog.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 748e804..7dd51cc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,13 +1,11 @@ Changelog ~~~~~~~~~ -Unreleased ----------- - -General: +0.33.0 (January 2024) +--------------------- +* Updated pytket version requirement to 1.24. * Python 3.12 support added, 3.9 dropped. -* pytket dependency updated to 1.24 0.32.0 (January 2024) --------------------- From d1eff655cfe43a94d14c43238937e747d8cb3166 Mon Sep 17 00:00:00 2001 From: Melf Date: Tue, 23 Jan 2024 11:40:14 +0000 Subject: [PATCH 6/6] update version number --- _metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_metadata.py b/_metadata.py index 9cc5c03..c86b841 100644 --- a/_metadata.py +++ b/_metadata.py @@ -1,2 +1,2 @@ -__extension_version__ = "0.32.0" +__extension_version__ = "0.33.0" __extension_name__ = "pytket-pyquil"