Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(template): merge template changes #55

Merged
merged 2 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div align="left">

![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)
<br />
[![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)
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion tools/extremal_dependency_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion tools/travis_before_script.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -41,7 +41,7 @@ commands =
[testenv:lint]
description = lint checks
envdir = {toxworkdir}/lint
basepython = python3.11
basepython = python3.12
extras =
lint
commands =
Expand All @@ -55,7 +55,7 @@ commands =
[testenv:style]
description = style formatter
envdir = {toxworkdir}/lint
basepython = python3.11
basepython = python3.12
extras =
lint
commands =
Expand All @@ -80,7 +80,7 @@ commands =
################################################################################
## NOTEBOOK
################################################################################
[testenv:py3{8,9,10,11}-notebook]
[testenv:py3{8,9,10,11,12}-notebook]
extras =
notebook
lint
Expand Down
Loading