From 6a6de82d1a0b5b02c7551d2aeafa974656b67ec3 Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 11:43:45 +0200 Subject: [PATCH 1/7] add python 3.12 tests --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6ba0519..b454eeb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,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 :: Hydrology', 'Intended Audience :: Science/Research', "License :: OSI Approved :: MIT License", @@ -62,7 +63,7 @@ line-length = 88 legacy_tox_ini = """ [tox] requires = tox>=4 - env_list = format, type, lint, py{38,39,310,311} + env_list = format, type, lint, py{38,39,310,311,312} [testenv] description = run unit tests From a7609133632e4b7f7d656a3351f24cc6aeaa66f7 Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 11:44:35 +0200 Subject: [PATCH 2/7] add python 3.12 test suite --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95b0c5d..50f4acb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,9 @@ jobs: - name: Test suite with py311-ubuntu python: "3.11" os: ubuntu-latest + - name: Test suite with py312-ubuntu + python: "3.12" + os: ubuntu-latest toxenv: py311 - name: Type check with mypy python: "3.9" From 8d8d18c42bf58b2a097a4edd50c1cc259cf5cb10 Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 11:50:40 +0200 Subject: [PATCH 3/7] add --check to black and isort --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b454eeb..3504d5c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,8 +76,8 @@ legacy_tox_ini = """ basepython = python3.9 extras = formatting commands = - black src - isort src + black src --check --verbose + isort src --check [testenv:type] description = run type checks From d3a33455796894771c1e681b8c9cf8c43e78e749 Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 11:53:59 +0200 Subject: [PATCH 4/7] test release candidate --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 50f4acb..19d5992 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,9 +27,9 @@ jobs: python: "3.11" os: ubuntu-latest - name: Test suite with py312-ubuntu - python: "3.12" + python: "3.12-dev" os: ubuntu-latest - toxenv: py311 + toxenv: py312 - name: Type check with mypy python: "3.9" os: ubuntu-latest From 296b04b07de941011c769a833429c7c7c57f508b Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 11:58:59 +0200 Subject: [PATCH 5/7] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3504d5c..a389c4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ line-length = 88 legacy_tox_ini = """ [tox] requires = tox>=4 - env_list = format, type, lint, py{38,39,310,311,312} + env_list = format, type, lint, py38, py39, py310, py311, py312 [testenv] description = run unit tests From 17538e0383503f91e9f3597f8c2ecfa9fa6ccb3c Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 13:51:45 +0200 Subject: [PATCH 6/7] add experimental check --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 19d5992..6fadf62 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,6 +7,7 @@ on: jobs: test: runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: @@ -15,37 +16,46 @@ jobs: python: "3.8" os: ubuntu-latest toxenv: py38 + experimental: false - name: Test suite with py39-ubuntu python: "3.9" os: ubuntu-latest toxenv: py39 + experimental: false - name: Test suite with py310-ubuntu python: "3.10" os: ubuntu-latest toxenv: py310 + experimental: false - name: Test suite with py311-ubuntu python: "3.11" os: ubuntu-latest + experimental: false - name: Test suite with py312-ubuntu python: "3.12-dev" os: ubuntu-latest toxenv: py312 + experimental: true - name: Type check with mypy python: "3.9" os: ubuntu-latest toxenv: type + experimental: false - name: Formatting with black + isort python: "3.9" os: ubuntu-latest toxenv: format + experimental: false - name: Linting with flake8 + ruff python: "3.9" os: ubuntu-latest toxenv: lint + experimental: false - name: Codacy Coverage Report python: "3.9" os: ubuntu-latest toxenv: coverage + experimental: false name: ${{ matrix.name }} env: From 10606d23fb075ce9d42a3112a1feefb79ca5ce4f Mon Sep 17 00:00:00 2001 From: Martin Vonk Date: Thu, 14 Sep 2023 13:54:43 +0200 Subject: [PATCH 7/7] add toxenv back for py311 --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6fadf62..f9b476c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,6 +30,7 @@ jobs: - name: Test suite with py311-ubuntu python: "3.11" os: ubuntu-latest + toxenv: py311 experimental: false - name: Test suite with py312-ubuntu python: "3.12-dev"