From c5bc4c32485e65e16c6c32da4dee81acab87b672 Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 19 Dec 2023 22:23:38 +0100 Subject: [PATCH 1/3] updated VS Code settings --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 30f287f8..80fb7d27 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,7 +11,7 @@ "[python]": { "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" }, }, "autoDocstring.docstringFormat": "numpy", @@ -44,4 +44,4 @@ "includeAllSymbols": true, }, ], -} \ No newline at end of file +} From 823954c8ea5e0f36371a515507f15a768b32df02 Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 19 Dec 2023 22:24:26 +0100 Subject: [PATCH 2/3] updated versions of black, ruff, pyright updated to black[jupyter]==23.12 (from black[jupyter]==23.11) updated to ruff==0.1.8 (from ruff==0.1.6) updated to pyright==1.1.338 (from pyright==1.1.336) --- .github/workflows/_code_quality.yml | 6 +++--- requirements-dev.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_code_quality.yml b/.github/workflows/_code_quality.yml index f155ab83..2ee82477 100644 --- a/.github/workflows/_code_quality.yml +++ b/.github/workflows/_code_quality.yml @@ -13,7 +13,7 @@ jobs: options: '--check --diff' src: '.' jupyter: true - version: '==23.11' + version: '==23.12' ruff: runs-on: ubuntu-latest @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: pip install -r requirements.txt - name: Install ruff - run: pip install ruff==0.1.6 + run: pip install ruff==0.1.8 - name: Run ruff run: ruff . @@ -45,6 +45,6 @@ jobs: pip install -r requirements.txt pip install pytest - name: Install pyright - run: pip install pyright==1.1.336 + run: pip install pyright==1.1.338 - name: Run pyright run: pyright . diff --git a/requirements-dev.txt b/requirements-dev.txt index d9188985..facdf688 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,9 @@ pytest>=7.4 pytest-cov>=4.1 pytest-randomly>=3.15 -black[jupyter]==23.11 -ruff==0.1.6 -pyright==1.1.336 +black[jupyter]==23.12 +ruff==0.1.8 +pyright==1.1.338 Sphinx>=7.2 sphinx-argparse-cli>=1.11 myst-parser>=2.0 From add4fcf140275ef8f04af4d28fffe3ff1fccd1aa Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 19 Dec 2023 22:33:12 +0100 Subject: [PATCH 3/3] GitHub workflows: Include Python 3.12 release version as standard, and Python 3.13.0a2 as "future" test. --- .github/workflows/_test.yml | 2 ++ .github/workflows/_test_future.yml | 4 ++-- pyproject.toml | 2 +- setup.cfg | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index b78e2ad8..8b21b411 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -20,6 +20,8 @@ jobs: toxenv: 'py310' - version: '3.11' toxenv: 'py311' + - version: '3.12' + toxenv: 'py312' steps: - uses: actions/checkout@v4 - name: Install Python ${{ matrix.python.version }} diff --git a/.github/workflows/_test_future.yml b/.github/workflows/_test_future.yml index 49405a51..5d07fee3 100644 --- a/.github/workflows/_test_future.yml +++ b/.github/workflows/_test_future.yml @@ -16,8 +16,8 @@ jobs: - runner: windows-latest toxenv: windows python: - - version: '3.12.0rc3' - toxenv: 'py312' + - version: '3.13.0a2' + toxenv: 'py313' steps: - uses: actions/checkout@v4 - name: Install Python ${{ matrix.python.version }} diff --git a/pyproject.toml b/pyproject.toml index 1533511d..c15f6402 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 120 -target-version = ["py39", "py310"] +target-version = ["py39", "py310", "py311", "py312"] [tool.ruff] exclude = [ diff --git a/setup.cfg b/setup.cfg index 97da2c9b..69478fd7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,6 +16,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Operating System :: Microsoft :: Windows Operating System :: POSIX :: Linux Operating System :: MacOS @@ -78,9 +79,9 @@ source = [tox:tox] isolated_build = True -envlist = py{39,310,311}-{linux,macos,windows} -# envlist = py{39,310,311}-{windows} -# envlist = py{39,310,311} +envlist = py{39,310,311,312}-{linux,macos,windows} +# envlist = py{39,310,311,312}-{windows} +# envlist = py{39,310,311,312} [testenv] system_site_packages = True