From b1d051f9353e99440a30cb5a9fb7c005b9361df8 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:24:34 +0200 Subject: [PATCH 01/23] docs: clarify styling comment Signed-off-by: F.N. Claessen --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9713e714..885d53ba 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Note: use tabs +# Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script .PHONY: install-deps install-tb freeze-deps test From 49f9a019f63d174fc38856b07a018bd03489e5a6 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:26:27 +0200 Subject: [PATCH 02/23] feat: `make test` tests optional parts, too Signed-off-by: F.N. Claessen --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 885d53ba..e87a341c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,11 @@ install-tb: pre-commit install test: + make test-core + make test-forecast + make test-viz + +test-core: pip install -e . pip install setuptools_scm pytest pytest --ignore test_forecast__ --ignore test_viz__ From 7bc7bc33e8300da146011f9ee6559a38cc645afa Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:38:11 +0200 Subject: [PATCH 03/23] chore: add classifiers for Python 3.10 and 3.11 Signed-off-by: F.N. Claessen --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index a1b1c904..6550d59a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,8 @@ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", From dc15273dcfd66e68690f5afcd620be927eb32dc1 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:38:44 +0200 Subject: [PATCH 04/23] chore: move requirements to python-version-specific folder Signed-off-by: F.N. Claessen --- Makefile | 8 ++++++-- dev/{ => 3.9}/requirements.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) rename dev/{ => 3.9}/requirements.txt (95%) diff --git a/Makefile b/Makefile index e87a341c..37f01462 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +# Check Python major and minor version +# For more information, see https://stackoverflow.com/a/22105036 +PYV = $(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_info[:2]));sys.stdout.write(t)") + # Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script .PHONY: install-deps install-tb freeze-deps test @@ -6,12 +10,12 @@ install: install-deps install-tb install-deps: pip install --upgrade pip-tools - pip-sync dev/requirements.txt + pip-sync dev/${PYV}/requirements.txt pip install pre-commit freeze-deps: pip install --upgrade pip-tools - pip-compile -o dev/requirements.txt # use --upgrade or --upgrade-package to actually change versions + pip-compile -o dev/${PYV}/requirements.txt # use --upgrade or --upgrade-package to actually change versions install-tb: pip install -e . diff --git a/dev/requirements.txt b/dev/3.9/requirements.txt similarity index 95% rename from dev/requirements.txt rename to dev/3.9/requirements.txt index 3a92c510..0397cde2 100644 --- a/dev/requirements.txt +++ b/dev/3.9/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=dev/requirements.txt +# pip-compile --output-file=dev/3.9/requirements.txt # altair==4.1.0 # via timely-beliefs (setup.py) From dc3887496572128f1aad1a7129f71087bc4c7d56 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:40:22 +0200 Subject: [PATCH 05/23] feature: make command to upgrade deps Signed-off-by: F.N. Claessen --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37f01462..d48d2210 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PYV = $(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_ # Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script -.PHONY: install-deps install-tb freeze-deps test +.PHONY: install-deps install-tb freeze-deps upgrade-deps test install: install-deps install-tb @@ -17,6 +17,11 @@ freeze-deps: pip install --upgrade pip-tools pip-compile -o dev/${PYV}/requirements.txt # use --upgrade or --upgrade-package to actually change versions +upgrade-deps: + pip install --upgrade pip-tools + pip-compile -o dev/${PYV}/requirements.txt --upgrade + make test + install-tb: pip install -e . pre-commit install From 8ded176aba7efbef5fd5b01a247a65254ca693d9 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:42:08 +0200 Subject: [PATCH 06/23] chore: missing commands from listing, and define commands in the same order as the listing Signed-off-by: F.N. Claessen --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d48d2210..c1c78f9f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PYV = $(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_ # Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script -.PHONY: install-deps install-tb freeze-deps upgrade-deps test +.PHONY: install install-deps install-tb freeze-deps upgrade-deps test test-core test-forecast test-viz install: install-deps install-tb @@ -13,6 +13,10 @@ install-deps: pip-sync dev/${PYV}/requirements.txt pip install pre-commit +install-tb: + pip install -e . + pre-commit install + freeze-deps: pip install --upgrade pip-tools pip-compile -o dev/${PYV}/requirements.txt # use --upgrade or --upgrade-package to actually change versions @@ -22,10 +26,6 @@ upgrade-deps: pip-compile -o dev/${PYV}/requirements.txt --upgrade make test -install-tb: - pip install -e . - pre-commit install - test: make test-core make test-forecast From 99aaa260c80cb4fa9798c72d49b784ca2c4e4d20 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:42:26 +0200 Subject: [PATCH 07/23] feature: add requirements.txt for Python 3.11 Signed-off-by: F.N. Claessen --- dev/3.11/requirements.txt | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 dev/3.11/requirements.txt diff --git a/dev/3.11/requirements.txt b/dev/3.11/requirements.txt new file mode 100644 index 00000000..b7b4b31b --- /dev/null +++ b/dev/3.11/requirements.txt @@ -0,0 +1,52 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=dev/3.11/requirements.txt +# +dill==0.3.8 + # via openturns +greenlet==3.1.0 + # via sqlalchemy +importlib-metadata==8.5.0 + # via timely-beliefs (setup.py) +isodate==0.6.1 + # via timely-beliefs (setup.py) +numpy==1.26.4 ; python_version > "3.7" + # via + # pandas + # properscoring + # scipy + # timely-beliefs (setup.py) +openturns==1.23 + # via timely-beliefs (setup.py) +pandas==2.2.1 ; python_version > "3.7" + # via timely-beliefs (setup.py) +properscoring==0.1 + # via timely-beliefs (setup.py) +psutil==6.0.0 + # via openturns +psycopg2-binary==2.9.9 + # via timely-beliefs (setup.py) +python-dateutil==2.9.0.post0 + # via pandas +pytz==2024.2 + # via + # pandas + # timely-beliefs (setup.py) +scipy==1.14.1 ; python_version > "3.7" + # via + # properscoring + # timely-beliefs (setup.py) +six==1.16.0 + # via + # isodate + # python-dateutil +sqlalchemy==2.0.35 + # via timely-beliefs (setup.py) +typing-extensions==4.12.2 + # via sqlalchemy +tzdata==2024.1 + # via pandas +zipp==3.20.2 + # via importlib-metadata From cdedef8e2d6819650ce3c36de8c03e1483fc7b9b Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:42:54 +0200 Subject: [PATCH 08/23] chore: update dev docs Signed-off-by: F.N. Claessen --- dev/dev.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/dev.md b/dev/dev.md index 1cbd40a3..b59a7826 100644 --- a/dev/dev.md +++ b/dev/dev.md @@ -21,8 +21,8 @@ And run tests: To update dependencies run: - pip-compile -o dev/requirements.txt -U + make upgrade-deps To install dependencies run: - pip install -r dev/requirements.txt + make install-deps From c73557978a32e61e019fcf3a055ad7fbb3e0bf67 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:47:27 +0200 Subject: [PATCH 09/23] refactor: `make test` uses all tests straightaway Signed-off-by: F.N. Claessen --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c1c78f9f..0dbd2f90 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,9 @@ upgrade-deps: make test test: - make test-core - make test-forecast - make test-viz + pip install -e . + pip install setuptools_scm pytest + pytest test-core: pip install -e . From 7eae0760b723570f4efc4f833e33c51dd5ebaea0 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 15:51:33 +0200 Subject: [PATCH 10/23] feature: ensure dependencies folder Signed-off-by: F.N. Claessen --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0dbd2f90..4cd1def0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PYV = $(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_ # Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script -.PHONY: install install-deps install-tb freeze-deps upgrade-deps test test-core test-forecast test-viz +.PHONY: install install-deps install-tb freeze-deps upgrade-deps test test-core test-forecast test-viz ensure-deps-folder install: install-deps install-tb @@ -18,10 +18,12 @@ install-tb: pre-commit install freeze-deps: + make ensure-deps-folder pip install --upgrade pip-tools pip-compile -o dev/${PYV}/requirements.txt # use --upgrade or --upgrade-package to actually change versions upgrade-deps: + make ensure-deps-folder pip install --upgrade pip-tools pip-compile -o dev/${PYV}/requirements.txt --upgrade make test @@ -45,3 +47,6 @@ test-viz: pip install -e .[viz] pip install setuptools_scm pytest pytest -k test_viz__ + +ensure-deps-folder: + mkdir -p dev/${PYV} From 3ee98e1ff93123831640d3b762f3a762220a74c8 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:04:03 +0200 Subject: [PATCH 11/23] fix: installation dependencies for all tests Signed-off-by: F.N. Claessen --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4cd1def0..228f66ec 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ upgrade-deps: make test test: - pip install -e . + pip install -e .[forecast,viz] pip install setuptools_scm pytest pytest From e19b802132622cb2616e6cacaad9b045c5a3aad6 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:06:44 +0200 Subject: [PATCH 12/23] docs: obsolete comment Signed-off-by: F.N. Claessen --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 228f66ec..15396034 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ install-tb: freeze-deps: make ensure-deps-folder pip install --upgrade pip-tools - pip-compile -o dev/${PYV}/requirements.txt # use --upgrade or --upgrade-package to actually change versions + pip-compile -o dev/${PYV}/requirements.txt upgrade-deps: make ensure-deps-folder From 001e0b769c3780873017613c049b3638ae4f20c3 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:19:47 +0200 Subject: [PATCH 13/23] feature: allow skipping test when upgrading dependencies Signed-off-by: F.N. Claessen --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 15396034..ba2f3a10 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,9 @@ upgrade-deps: make ensure-deps-folder pip install --upgrade pip-tools pip-compile -o dev/${PYV}/requirements.txt --upgrade +ifneq ($(skip-test), yes) make test +endif test: pip install -e .[forecast,viz] From 798cec53c59b5b610c15ebcb00819042421aaddd Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:24:06 +0200 Subject: [PATCH 14/23] refactor: move test dependencies to `make install-for-test` Signed-off-by: F.N. Claessen --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ba2f3a10..03b1381a 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,13 @@ PYV = $(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_ # Note: use tabs (not spaces) for indentation # actions which are virtual, i.e. not a script -.PHONY: install install-deps install-tb freeze-deps upgrade-deps test test-core test-forecast test-viz ensure-deps-folder +.PHONY: install install-deps install-tb install-for-test freeze-deps upgrade-deps test test-core test-forecast test-viz ensure-deps-folder install: install-deps install-tb +install-for-test: + pip install setuptools_scm pytest + install-deps: pip install --upgrade pip-tools pip-sync dev/${PYV}/requirements.txt @@ -32,22 +35,22 @@ endif test: pip install -e .[forecast,viz] - pip install setuptools_scm pytest + make install-for-test pytest test-core: pip install -e . - pip install setuptools_scm pytest + make install-for-test pytest --ignore test_forecast__ --ignore test_viz__ test-forecast: pip install -e .[forecast] - pip install setuptools_scm pytest + make install-for-test pytest -k test_forecast__ test-viz: pip install -e .[viz] - pip install setuptools_scm pytest + make install-for-test pytest -k test_viz__ ensure-deps-folder: From 3d1adc6d0a66443a4141cbad0706a84774d33a5b Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:24:25 +0200 Subject: [PATCH 15/23] feature: test the core with fewer pinned dependencies, and then test everything with share dependencies Signed-off-by: F.N. Claessen --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 03b1381a..ab4a5297 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,10 @@ ifneq ($(skip-test), yes) endif test: + make test-core # test just the core, which may have fewer pinned dependencies + make test-all # test everything sharing the same dependencies + +test-all: pip install -e .[forecast,viz] make install-for-test pytest From 5d5977ac33f0067c5dfaf4df455690f333832a6a Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:48:48 +0200 Subject: [PATCH 16/23] chore: unpin numpy and scipy in optional forecast dependencies Signed-off-by: F.N. Claessen --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6550d59a..0583c7b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,8 +67,7 @@ viz = [ ] forecast = [ "sktime", - "numpy<1.25,>=1.21.0; python_version > '3.7'", # required by sktime==0.15.0 - "scipy<2.0.0; python_version > '3.7'", # required by sktime==0.15.0 + "numpy>=1.21.0; python_version > '3.7'", # required by sktime==0.15.0 ] [project.readme] From c574364780be68ba6bbc4487386e41d8badaa362 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 16:56:32 +0200 Subject: [PATCH 17/23] chore: unpin pandas for 3.11 and higher Signed-off-by: F.N. Claessen --- dev/3.11/requirements.txt | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/3.11/requirements.txt b/dev/3.11/requirements.txt index b7b4b31b..d94040d9 100644 --- a/dev/3.11/requirements.txt +++ b/dev/3.11/requirements.txt @@ -12,7 +12,7 @@ importlib-metadata==8.5.0 # via timely-beliefs (setup.py) isodate==0.6.1 # via timely-beliefs (setup.py) -numpy==1.26.4 ; python_version > "3.7" +numpy==2.1.1 ; python_version > "3.7" # via # pandas # properscoring @@ -20,7 +20,7 @@ numpy==1.26.4 ; python_version > "3.7" # timely-beliefs (setup.py) openturns==1.23 # via timely-beliefs (setup.py) -pandas==2.2.1 ; python_version > "3.7" +pandas==2.2.2 ; python_version > "3.7" # via timely-beliefs (setup.py) properscoring==0.1 # via timely-beliefs (setup.py) diff --git a/pyproject.toml b/pyproject.toml index 0583c7b1..220acba9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ dependencies = [ # https://github.com/SeitaBV/timely-beliefs/issues/148 "pandas >= 1.4.0, != 2.1.0, !=2.1.1; python_version > '3.7'", # https://github.com/SeitaBV/timely-beliefs/issues/177 - "pandas < 2.2.2", + "pandas < 2.2.2; python_version <= '3.10'", # scipy's setup requires minimal Python versions "scipy<1.6; python_version <= '3.6'", "scipy<1.8; python_version <= '3.7'", From 66b6c64cc65a7aab5a9b37f512d817c6e1171a43 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 17:09:22 +0200 Subject: [PATCH 18/23] feature: automate test pipeline for Python 3.11 Signed-off-by: F.N. Claessen --- .github/workflows/lint-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index d0da432d..f59e717c 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - py_version: [ '3.7', '3.8', '3.9', '3.10' ] + py_version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] include: - py_version: '3.7' skip-viz: true From d727aeb1355fe61ab5210390461eb5fa7deb9c51 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 17:45:06 +0200 Subject: [PATCH 19/23] fix: AttributeError: `np.NaN` was removed in the NumPy 2.0 release. Use `np.nan` instead. Signed-off-by: F.N. Claessen --- timely_beliefs/tests/test_df_resampling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timely_beliefs/tests/test_df_resampling.py b/timely_beliefs/tests/test_df_resampling.py index 8eaa3a78..8496fed3 100644 --- a/timely_beliefs/tests/test_df_resampling.py +++ b/timely_beliefs/tests/test_df_resampling.py @@ -303,7 +303,7 @@ def test_downsample_once_upsample_once_around_dst( df = df_wxyz( time_slot_sensor, 25, 1, 1, 1, start ) # 1 deterministic belief per event - df.iloc[0] = np.NaN # introduce 1 NaN value + df.iloc[0] = np.nan # introduce 1 NaN value print(df) # Downsample the original frame From cb0eb78434d3f097ef3f3a70a48a88522430c8f7 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 17:49:38 +0200 Subject: [PATCH 20/23] Revert "chore: unpin pandas for 3.11 and higher" This reverts commit c574364780be68ba6bbc4487386e41d8badaa362. --- dev/3.11/requirements.txt | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/3.11/requirements.txt b/dev/3.11/requirements.txt index d94040d9..b7b4b31b 100644 --- a/dev/3.11/requirements.txt +++ b/dev/3.11/requirements.txt @@ -12,7 +12,7 @@ importlib-metadata==8.5.0 # via timely-beliefs (setup.py) isodate==0.6.1 # via timely-beliefs (setup.py) -numpy==2.1.1 ; python_version > "3.7" +numpy==1.26.4 ; python_version > "3.7" # via # pandas # properscoring @@ -20,7 +20,7 @@ numpy==2.1.1 ; python_version > "3.7" # timely-beliefs (setup.py) openturns==1.23 # via timely-beliefs (setup.py) -pandas==2.2.2 ; python_version > "3.7" +pandas==2.2.1 ; python_version > "3.7" # via timely-beliefs (setup.py) properscoring==0.1 # via timely-beliefs (setup.py) diff --git a/pyproject.toml b/pyproject.toml index 220acba9..0583c7b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ dependencies = [ # https://github.com/SeitaBV/timely-beliefs/issues/148 "pandas >= 1.4.0, != 2.1.0, !=2.1.1; python_version > '3.7'", # https://github.com/SeitaBV/timely-beliefs/issues/177 - "pandas < 2.2.2; python_version <= '3.10'", + "pandas < 2.2.2", # scipy's setup requires minimal Python versions "scipy<1.6; python_version <= '3.6'", "scipy<1.8; python_version <= '3.7'", From 5577fae8935f15893bcd79350e61cfec058607d5 Mon Sep 17 00:00:00 2001 From: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:59:44 +0200 Subject: [PATCH 21/23] feature: automate test pipeline for Python 3.12 (#190) Signed-off-by: F.N. Claessen --- .github/workflows/lint-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index f59e717c..b33d556b 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - py_version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + py_version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ] include: - py_version: '3.7' skip-viz: true From e9ffb4d945f1295be5b2f629e1effc9655846a81 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 22:00:57 +0200 Subject: [PATCH 22/23] fix(deps): pin only from 3.11 onwards Signed-off-by: F.N. Claessen --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0583c7b1..77fcec7c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,8 +52,8 @@ dependencies = [ "pandas >= 1.1.5, < 1.3; python_version == '3.7'", # https://github.com/SeitaBV/timely-beliefs/issues/148 "pandas >= 1.4.0, != 2.1.0, !=2.1.1; python_version > '3.7'", - # https://github.com/SeitaBV/timely-beliefs/issues/177 - "pandas < 2.2.2", + # https://github.com/SeitaBV/timely-beliefs/issues/189 + "pandas < 2.2.2; python_version >= '3.11'", # scipy's setup requires minimal Python versions "scipy<1.6; python_version <= '3.6'", "scipy<1.8; python_version <= '3.7'", From c4533b93cd4b0729a0fc43c3d661cfd237e7bb86 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Thu, 19 Sep 2024 22:11:45 +0200 Subject: [PATCH 23/23] Revert "fix(deps): pin only from 3.11 onwards" This reverts commit e9ffb4d945f1295be5b2f629e1effc9655846a81. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 77fcec7c..0583c7b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,8 +52,8 @@ dependencies = [ "pandas >= 1.1.5, < 1.3; python_version == '3.7'", # https://github.com/SeitaBV/timely-beliefs/issues/148 "pandas >= 1.4.0, != 2.1.0, !=2.1.1; python_version > '3.7'", - # https://github.com/SeitaBV/timely-beliefs/issues/189 - "pandas < 2.2.2; python_version >= '3.11'", + # https://github.com/SeitaBV/timely-beliefs/issues/177 + "pandas < 2.2.2", # scipy's setup requires minimal Python versions "scipy<1.6; python_version <= '3.6'", "scipy<1.8; python_version <= '3.7'",