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

WIP python 3.13 support #6494

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
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
9 changes: 6 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,19 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12","3.13"]
exclude:
- os: windows-latest
python-version: 3.10
- os: windows-latest
python-version: 3.11
- os: windows-latest
python-version: "3.13"
env:
OS: ${{ matrix.os }}
SPHINX_WARNINGS_AS_ERROR: true
SPHINX_OPTS: "-v -j 2"
# SPHINX_OPTS: "-v -j 2"
SPHINX_OPTS: "-v"
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand All @@ -50,7 +53,7 @@ jobs:
fetch-depth: '0'
- name: set-sphinx-opts
run: |
echo "SPHINX_OPTS=-W -v --keep-going -j 2" >> $GITHUB_ENV
echo "SPHINX_OPTS=-W -v --keep-going" >> $GITHUB_ENV
if: ${{ fromJSON(env.SPHINX_WARNINGS_AS_ERROR) }}
- name: install pandoc linux
# add the || true logic to not error in case the index cannot be fetched.
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
min-version: [false]
include:
- os: ubuntu-latest
Expand All @@ -43,6 +43,8 @@ jobs:
python-version: "3.11"
- os: windows-latest
python-version: "3.12"
- os: windows-latest
python-version: "3.13"
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
Expand Down
9 changes: 6 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
]
license = {text = "MIT"}
Expand All @@ -32,7 +33,7 @@ dependencies = [
"numpy>=1.22.4",
"packaging>=20.0",
"pandas>=1.4.0",
"pyarrow>=11.0.0", # will become a requirement of pandas. Installing explicitly silences a warning
# "pyarrow>=11.0.0", # will become a requirement of pandas. Installing explicitly silences a warning
"pyvisa>=1.11.0, <1.15.0",
"ruamel.yaml>=0.16.0,!=0.16.6",
"tabulate>=0.9.0",
Expand Down Expand Up @@ -94,7 +95,7 @@ test = [
"types-tqdm>=4.64.6",
"types_pywin32>=305.0.0.7",
"qcodes_loop>=0.1.1",
"zhinst.qcodes>=0.5", # typecheck zhinst driver alias
# "zhinst.qcodes>=0.5", # typecheck zhinst driver alias
"libcst>=1.2.0", # refactor tests
"jinja2>=3.1.3", # transitive dependency pin due to cve in earlier version
]
Expand Down Expand Up @@ -222,7 +223,9 @@ filterwarnings = [
'ignore:pkg_resources is deprecated as an API:DeprecationWarning', # pyvisa-sim
'ignore:open_binary is deprecated:DeprecationWarning', # pyvisa-sim
'ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning', # tqdm dateutil
'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning' # jupyter
'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning', # jupyter
'ignore:Parsing dates involving a day of month without a year specified is ambiguious:DeprecationWarning', # ipykernel 3.13+
'ignore:unclosed database in:ResourceWarning' # internal should be fixed
]

[tool.ruff]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import HDAWG
from zhinst.qcodes import HDAWG # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
2 changes: 1 addition & 1 deletion src/qcodes/instrument_drivers/zurich_instruments/hf2.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import HF2
from zhinst.qcodes import HF2 # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
2 changes: 1 addition & 1 deletion src/qcodes/instrument_drivers/zurich_instruments/mfli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import MFLI
from zhinst.qcodes import MFLI # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
2 changes: 1 addition & 1 deletion src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import PQSC
from zhinst.qcodes import PQSC # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import SHFQA
from zhinst.qcodes import SHFQA # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import SHFSG
from zhinst.qcodes import SHFSG # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import UHFLI
from zhinst.qcodes import UHFLI # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


try:
from zhinst.qcodes import UHFQA
from zhinst.qcodes import UHFQA # type: ignore[import-not-found]
except ImportError:
raise ImportError(
"""
Expand Down
Loading