From 2fc61e00f7fc901692db14abb425c61f507558ee Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 21:35:18 +0200 Subject: [PATCH 1/6] ci: py3.12 support --- .github/workflows/packaging_test.yml | 2 +- .github/workflows/unittests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packaging_test.yml b/.github/workflows/packaging_test.yml index d2c8a27..43841ea 100644 --- a/.github/workflows/packaging_test.yml +++ b/.github/workflows/packaging_test.yml @@ -6,7 +6,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index f962770..c54280a 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -6,7 +6,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] os: [ ubuntu-latest ] steps: - uses: actions/checkout@v4 From fd1d25b7a682bbf2fa114ac1abf0dc0acc2783cb Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 21:40:02 +0200 Subject: [PATCH 2/6] docs: updated project info and black config --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 56016cc..09327a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 79 -target-version = ['py37', 'py38', 'py39', 'py310', 'py311'] +target-version = ['py37', 'py38', 'py39', 'py310', 'py311', 'py312'] exclude = ''' /( \.eggs @@ -43,7 +43,12 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "holidays>=0.16,<0.28;python_version<'3.8'", From 29ef21adc4c290a69c5c1ca185d842dcbd76ee04 Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 22:18:11 +0200 Subject: [PATCH 3/6] ci: pin holidays as typed marker is not found by mypy --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e8a4c00..363655b 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,7 @@ commands = # the type_check environment checks the type hints using mypy deps = -r requirements.txt - mypy + mypy<0.34 # temporarly pinned because PR #65 types-pytz types-python-dateutil setenv = PYTHONPATH = {toxinidir}/src From be8caef4d695c48fc1d7469e21dfc37f38149be7 Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 22:18:48 +0200 Subject: [PATCH 4/6] chore: add type_check deps to dev env --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 363655b..9cda3dc 100644 --- a/tox.ini +++ b/tox.ini @@ -57,6 +57,7 @@ commands = deps = {[testenv:tests]deps} {[testenv:linting]deps} + {[testenv:type_check]deps} {[testenv:format]deps} pip-tools commands = From c7d08f1e430fce779593ce378434ad6bc0858574 Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 22:22:49 +0200 Subject: [PATCH 5/6] ci: ahja --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9cda3dc..15ca819 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,8 @@ commands = # the type_check environment checks the type hints using mypy deps = -r requirements.txt - mypy<0.34 # temporarly pinned because PR #65 + holidays<0.34 # temporarly pinned because PR #65 + mypy types-pytz types-python-dateutil setenv = PYTHONPATH = {toxinidir}/src From 36179b4c6fdd961802bd874761e8668413303587 Mon Sep 17 00:00:00 2001 From: Marcel Johannesmann Date: Tue, 3 Oct 2023 22:27:17 +0200 Subject: [PATCH 6/6] typo --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 15ca819..c958f8f 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,7 @@ commands = # the type_check environment checks the type hints using mypy deps = -r requirements.txt - holidays<0.34 # temporarly pinned because PR #65 + holidays<0.34 # temporarly pinned because PR #55 mypy types-pytz types-python-dateutil