From 3044057c72139f50479c442140315419baabb215 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:37:55 -0600 Subject: [PATCH] chore(template): add support for python 3.12 (#55) Merge pedrorrivero/pyproject-qiskit 3b69dd5 --------- Co-authored-by: pedrorrivero Co-authored-by: Pedro Rivero --- .github/ISSUE_TEMPLATE/bug.yaml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test-development.yml | 2 +- .github/workflows/test.yml | 2 +- .travis.yml | 17 +++++++++++++---- CONTRIBUTING.md | 2 +- INSTALL.md | 2 +- README.md | 2 +- pyproject.toml | 1 + tools/extremal_dependency_versions.py | 2 +- tools/travis_before_script.bash | 2 +- tox.ini | 10 +++++----- 13 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index 252452c..4ae170a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -33,7 +33,7 @@ body: id: python attributes: label: Python version - placeholder: e.g. 3.11.0 + placeholder: e.g. 3.12.0 validations: required: true - type: input diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index faf43ad..de6ecf3 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -19,7 +19,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ['3.11'] + python-version: ['3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 804e648..bb23efe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ['3.11'] + python-version: ['3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test-development.yml b/.github/workflows/test-development.yml index 2f2285a..675dbc4 100644 --- a/.github/workflows/test-development.yml +++ b/.github/workflows/test-development.yml @@ -21,7 +21,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ['3.11'] + python-version: ['3.12'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ef6c47..59e4d25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] include: - os: macos-latest python-version: '3.8' diff --git a/.travis.yml b/.travis.yml index a4854a8..474be5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ jobs: - os: windows python: "3.11" env: TOXENV=py311 + - os: windows + python: "3.12" + env: TOXENV=py312 - os: osx python: "3.8" @@ -44,6 +47,9 @@ jobs: - os: osx python: "3.11" env: TOXENV=py311 + - os: osx + python: "3.12" + env: TOXENV=py312 - os: linux python: "3.8" @@ -57,12 +63,15 @@ jobs: - os: linux python: "3.11" env: TOXENV=py311 + - os: linux + python: "3.12" + env: TOXENV=py312 - os: linux - python: "3.11" + python: "3.12" env: TOXENV=lint - os: linux - python: "3.11" + python: "3.12" env: TOXENV=coverage - name: "Minimum version tests" @@ -73,7 +82,7 @@ jobs: - STRATEGY=min - name: "Development version tests" os: linux - python: "3.11" + python: "3.12" env: - - TOXENV=py311 + - TOXENV=py312 - STRATEGY=dev diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b0240c..65bfc46 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -146,7 +146,7 @@ Alternatively, you can choose to run a particular batch of tests individually: ``` tox -e {env} ``` - where you replace `{env}` with (for instance) `py38`, `py39`, `py310` or `py311` depending on which version of python you have (to check python version, type `python --version` in the terminal). + where you replace `{env}` with (for instance) `py38`, `py39`, `py310`, `py311` or `py312` depending on which version of python you have (to check python version, type `python --version` in the terminal). - To run lint checks (checks formatting/style/syntax): ``` tox -e lint diff --git a/INSTALL.md b/INSTALL.md index 150aca6..1bb5fb9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ The following installation guide is generic and therefore needs to be adapted to To follow along, make sure that your local environment is compatible with the package: - Supported operating system (Linux, macOS, or Windows). -- Supported Python version (3.8 – 3.11). +- Supported Python version (3.8 – 3.12). - (Optional) We recommend updating `pip` to its latest version: ``` pip install -U pip diff --git a/README.md b/README.md index 3c3661c..fc24173 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
![Platform](https://img.shields.io/badge/Platform-Linux%20%7C%20macOS%20%7C%20Windows-informational) - [![Python](https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-informational)](https://www.python.org/) + [![Python](https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-informational)](https://www.python.org/) [![Qiskit](https://img.shields.io/badge/Qiskit-%E2%89%A5%200.45.1-6133BD)](https://github.com/Qiskit/qiskit)
[![Tests](https://github.com/qiskit-community/prototype-zne/actions/workflows/test.yml/badge.svg)](https://github.com/qiskit-community/prototype-zne/actions/workflows/test.yml) diff --git a/pyproject.toml b/pyproject.toml index 38f664c..f894089 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: Physics", ] dynamic = ["version", "description"] diff --git a/tools/extremal_dependency_versions.py b/tools/extremal_dependency_versions.py index ee6f23b..72bf5fa 100755 --- a/tools/extremal_dependency_versions.py +++ b/tools/extremal_dependency_versions.py @@ -23,7 +23,7 @@ def mapfunc_dev(dep): """Load the development version(s) of certain Qiskit-related packages""" # https://peps.python.org/pep-0440/#direct-references return re.sub( - r"^(qiskit-(?:terra|nature)).*$", + r"^(qiskit).*$", r"\1 @ git+https://github.com/Qiskit/\1.git", dep, ) diff --git a/tools/travis_before_script.bash b/tools/travis_before_script.bash index 82533de..e233f37 100644 --- a/tools/travis_before_script.bash +++ b/tools/travis_before_script.bash @@ -13,7 +13,7 @@ if [ "$STRATEGY" == "min" ]; then fi if [ "$STRATEGY" == "dev" ]; then - # Install Rust, which we'll need to build Qiskit Terra + # Install Rust, which we'll need to build Qiskit curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y fi diff --git a/tox.ini b/tox.ini index e10b228..fba5054 100644 --- a/tox.ini +++ b/tox.ini @@ -30,8 +30,8 @@ commands = ################################################################################ [testenv:coverage] description = coverage tests -envdir = {toxworkdir}/py311 -basepython = python3.11 +envdir = {toxworkdir}/py312 +basepython = python3.12 setenv = {[testenv]setenv} commands = @@ -41,7 +41,7 @@ commands = [testenv:lint] description = lint checks envdir = {toxworkdir}/lint -basepython = python3.11 +basepython = python3.12 extras = lint commands = @@ -55,7 +55,7 @@ commands = [testenv:style] description = style formatter envdir = {toxworkdir}/lint -basepython = python3.11 +basepython = python3.12 extras = lint commands = @@ -80,7 +80,7 @@ commands = ################################################################################ ## NOTEBOOK ################################################################################ -[testenv:py3{8,9,10,11}-notebook] +[testenv:py3{8,9,10,11,12}-notebook] extras = notebook lint