From cf9157c876ac54361265a3b1170123306e7a8a4f Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 13:46:48 -0500 Subject: [PATCH 01/11] GH1052 Enable support for python 3.13 --- .github/workflows/test.yml | 2 +- pyproject.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 55ae881f1..b29512938 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: matrix: # macos-latest is arm os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] name: OS ${{ matrix.os }} - Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index c58fe3802..120dc335d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,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", "Typing :: Stubs Only", ] @@ -42,13 +43,12 @@ pyright = ">=1.1.396" poethepoet = ">=0.16.5" loguru = ">=0.6.0" typing-extensions = ">=4.4.0" -matplotlib = ">=3.5.1,<3.9.0" # TODO https://github.com/pandas-dev/pandas/issues/58851 +matplotlib = ">=3.5.1" pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -# for tables, MacOS gives random CI failures on 3.9.2 -tables = { version = "==3.10.1", python = "<4" } # 3.8.0 depends on blosc2 which caps python to <4 +tables = { version = "==3.10.1", python = "<4" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" From 94a809fa4241f4ffb3983aa416d09093894e8f5a Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 13:51:08 -0500 Subject: [PATCH 02/11] Update pyproject --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 120dc335d..7e2c60775 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ pyright = ">=1.1.396" poethepoet = ">=0.16.5" loguru = ">=0.6.0" typing-extensions = ">=4.4.0" -matplotlib = ">=3.5.1" +matplotlib = ">=3.5.1,<3.9.0" # TODO https://github.com/pandas-dev/pandas/issues/58851 pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" @@ -63,7 +63,7 @@ SQLAlchemy = ">=2.0.12" types-python-dateutil = ">=2.8.19" beautifulsoup4 = ">=4.12.2" html5lib = ">=1.1" -python-calamine = "0.2.0" +python-calamine = ">=0.2.0" [build-system] requires = ["poetry-core>=1.0.0"] From 14fcfbc8fdedcdb97c3a9af0d86ee558c95f3894 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 13:55:55 -0500 Subject: [PATCH 03/11] Fix pyproject --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7e2c60775..111443965 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ odfpy = ">=1.4.1" xarray = ">=22.6.0" tabulate = ">=0.8.10" jinja2 = ">=3.1" -scipy = { version = ">=1.9.1", python = "<3.13" } +scipy = { version = ">=1.9.1", python = "<3.14" } SQLAlchemy = ">=2.0.12" types-python-dateutil = ">=2.8.19" beautifulsoup4 = ">=4.12.2" From f25b44fa87629f80cf01e97ee0557999b60c8159 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 14:30:29 -0500 Subject: [PATCH 04/11] Try fix for windows h5py --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 111443965..841637bef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,7 @@ packages = [{ "include" = "pandas-stubs" }] python = ">=3.10" types-pytz = ">= 2022.1.1" numpy = ">= 1.23.5" +h5py = {version = "^3.13.0", platform = "win64"} [tool.poetry.group.dev.dependencies] mypy = "1.15.0" @@ -63,7 +64,7 @@ SQLAlchemy = ">=2.0.12" types-python-dateutil = ">=2.8.19" beautifulsoup4 = ">=4.12.2" html5lib = ">=1.1" -python-calamine = ">=0.2.0" +python-calamine = ">=0.3.0" [build-system] requires = ["poetry-core>=1.0.0"] From 232da4330c37f425b7099bbe2ffef9998497fb89 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 14:35:34 -0500 Subject: [PATCH 05/11] Try fix for windows h5py --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 841637bef..ded7a667e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,6 @@ packages = [{ "include" = "pandas-stubs" }] python = ">=3.10" types-pytz = ">= 2022.1.1" numpy = ">= 1.23.5" -h5py = {version = "^3.13.0", platform = "win64"} [tool.poetry.group.dev.dependencies] mypy = "1.15.0" @@ -49,7 +48,7 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -tables = { version = "==3.10.1", python = "<4" } +tables = { version = "==3.10.2", python = "<4" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" From 128f5450639b6aefb9f4b5ad7aaef0ffe07f1ba5 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 14:40:45 -0500 Subject: [PATCH 06/11] Try fix for windows h5py --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ded7a667e..36d510171 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,8 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -tables = { version = "==3.10.2", python = "<4" } +tables = { version = "==3.10.2", python = ">=3.11,<4" } +tables = { version = "==3.10.1", python = "<3.11" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" From 7f50697cc8630ed9a89336850015480c1d46e414 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 14:49:28 -0500 Subject: [PATCH 07/11] Try fix for windows h5py --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 36d510171..674db4a02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,8 +48,7 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -tables = { version = "==3.10.2", python = ">=3.11,<4" } -tables = { version = "==3.10.1", python = "<3.11" } +tables = { version = ">=3.10.1", python = "<4" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" From 81eb21291b5ca36d2ed80c9bfad3150a282db4dc Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 15:05:49 -0500 Subject: [PATCH 08/11] GH1052 Clean up changes in pyproject --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 674db4a02..b43f73ad6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,9 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -tables = { version = ">=3.10.1", python = "<4" } +# for tables, MacOS gives random CI failures on 3.9.2 +# for tables, Windows build fails on 3.10.1 +tables = { version = ">=3.10.1", python = "<4" } # 3.8.0 depends on blosc2 which caps python to <4 lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" @@ -63,7 +65,7 @@ SQLAlchemy = ">=2.0.12" types-python-dateutil = ">=2.8.19" beautifulsoup4 = ">=4.12.2" html5lib = ">=1.1" -python-calamine = ">=0.3.0" +python-calamine = ">=0.2.0" [build-system] requires = ["poetry-core>=1.0.0"] From 58b98d327b57b1a875178e01fbeb92e49391d2a7 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Sun, 2 Mar 2025 15:06:19 -0500 Subject: [PATCH 09/11] Update pyproject.toml From 0355c2d236844db5debe666798383961828df693 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Tue, 4 Mar 2025 08:02:44 -0500 Subject: [PATCH 10/11] GH1052 PR feedback --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b43f73ad6..6f70c7e41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,9 +48,7 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -# for tables, MacOS gives random CI failures on 3.9.2 -# for tables, Windows build fails on 3.10.1 -tables = { version = ">=3.10.1", python = "<4" } # 3.8.0 depends on blosc2 which caps python to <4 +tables = { version = ">=3.10.2", python = "<4" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1" From 0ba7b632a2a21b3c4ec59785a13aaffcfda60175 Mon Sep 17 00:00:00 2001 From: Loic Diridollou Date: Tue, 4 Mar 2025 08:19:17 -0500 Subject: [PATCH 11/11] GH1052 PR feedback --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6f70c7e41..c71bebaf6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ pre-commit = ">=2.19.0" black = ">=23.3.0" isort = ">=5.12.0" openpyxl = ">=3.0.10" -tables = { version = ">=3.10.2", python = "<4" } +tables = { version = ">=3.10.1", python = "<4" } lxml = ">=4.9.1" pyreadstat = ">=1.2.0" xlrd = ">=2.0.1"