From 8a37db48453b205bad3dfc109c6dfa26f060249e Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Tue, 10 Sep 2024 16:47:03 +0700 Subject: [PATCH 1/8] Test compatibility with pandas 2.2.2 --- .github/workflows/test.yml | 2 +- noxfile.py | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 03caf46..750a8ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: ["3.8", "3.9", "3.10", "3.11"] - pandas-version: ["1.3.5", "1.4.4", "1.5.3"] + pandas-version: ["1.3.5", "1.4.4", "1.5.3", "2.2.2"] exclude: - python-version: "3.10" pandas-version: "1.3.5" diff --git a/noxfile.py b/noxfile.py index 9e5428f..4146b9b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,7 +17,7 @@ def lint(session): [ (python, pandas) for python in ("3.8", "3.9", "3.10", "3.11") - for pandas in ("1.3.5", "1.4.4", "1.5.3") + for pandas in ("1.3.5", "1.4.4", "1.5.3", "2.2.2") if (python, pandas) != ("3.10", "1.3.5") if (python, pandas) != ("3.10", "1.4.4") ], diff --git a/setup.cfg b/setup.cfg index fa173f8..c26e990 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ python_requires = >=3.7,<3.12 install_requires = urllib3~=1.26,>=1.21.1 presto-python-client>=0.6.0 - pandas>=1.3,<1.6 + pandas>=1.3 td-client>=1.1.0 pytz>=2018.5 numpy<1.24 From 40a7aa841d12d5e262d841202aaad73109353d74 Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Tue, 10 Sep 2024 17:06:16 +0700 Subject: [PATCH 2/8] Run CI on support-3.12 branch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 750a8ee..ab409dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [ master ] + branches: [ master, support-3.12 ] pull_request: branches: [ master ] From 2ace066272fc6dad3629dcb447ad0b81e7aea975 Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Tue, 10 Sep 2024 17:12:57 +0700 Subject: [PATCH 3/8] Exclude python 3.8 - pandas 2.2.2 pair --- .github/workflows/test.yml | 2 ++ noxfile.py | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab409dc..d2cc61c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,8 @@ jobs: pandas-version: "1.3.5" - python-version: "3.10" pandas-version: "1.4.4" + - python-version: "3.8" + pandas-version: "2.2.2" steps: diff --git a/noxfile.py b/noxfile.py index 4146b9b..3e254bb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -20,6 +20,7 @@ def lint(session): for pandas in ("1.3.5", "1.4.4", "1.5.3", "2.2.2") if (python, pandas) != ("3.10", "1.3.5") if (python, pandas) != ("3.10", "1.4.4") + if (python, pandas) != ("3.8", "2.2.2") ], ) def tests(session, python, pandas): From 37fed59f82db20f28acb158df498c065d6668f19 Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Mon, 16 Sep 2024 17:31:48 +0700 Subject: [PATCH 4/8] Add test for pandas 2.0.3 & 2.1.4 --- .github/workflows/test.yml | 6 +++++- noxfile.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2cc61c..1ddfea4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,12 +15,16 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: ["3.8", "3.9", "3.10", "3.11"] - pandas-version: ["1.3.5", "1.4.4", "1.5.3", "2.2.2"] + pandas-version: ["1.3.5", "1.4.4", "1.5.3", "2.0.3", "2.1.4", "2.2.2"] exclude: - python-version: "3.10" pandas-version: "1.3.5" - python-version: "3.10" pandas-version: "1.4.4" + - python-version: "3.8" + pandas-version: "2.0.3" + - python-version: "3.8" + pandas-version: "2.1.4" - python-version: "3.8" pandas-version: "2.2.2" diff --git a/noxfile.py b/noxfile.py index 3e254bb..420915d 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,9 +17,11 @@ def lint(session): [ (python, pandas) for python in ("3.8", "3.9", "3.10", "3.11") - for pandas in ("1.3.5", "1.4.4", "1.5.3", "2.2.2") + for pandas in ("1.3.5", "1.4.4", "1.5.3", "2.0.3", "2.1.4", "2.2.2") if (python, pandas) != ("3.10", "1.3.5") if (python, pandas) != ("3.10", "1.4.4") + if (python, pandas) != ("3.8", "2.0.3") + if (python, pandas) != ("3.8", "2.1.4") if (python, pandas) != ("3.8", "2.2.2") ], ) From 21a6fe4e1238f38f683491309ec8c1fc2f7b541b Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Mon, 16 Sep 2024 17:45:22 +0700 Subject: [PATCH 5/8] Test on branch support-pandas-2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ddfea4..a12ec17 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [ master, support-3.12 ] + branches: [ master, support-pandas-2 ] pull_request: branches: [ master ] From 7cf539f660625037d99827bb756ace7e76368e53 Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Mon, 16 Sep 2024 18:40:45 +0700 Subject: [PATCH 6/8] . --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a12ec17..aa15979 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [ master, support-pandas-2 ] + branches: [ master ] pull_request: branches: [ master ] From cad4317ed2e953b3b0c5dc769a43a268300d9acd Mon Sep 17 00:00:00 2001 From: Vu Tung Date: Tue, 17 Sep 2024 10:40:25 +0700 Subject: [PATCH 7/8] Test only major versions of pandas --- .github/workflows/test.yml | 10 +--------- noxfile.py | 6 +----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa15979..898771b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,16 +15,8 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: ["3.8", "3.9", "3.10", "3.11"] - pandas-version: ["1.3.5", "1.4.4", "1.5.3", "2.0.3", "2.1.4", "2.2.2"] + pandas-version: ["1.5.3", "2.2.2"] exclude: - - python-version: "3.10" - pandas-version: "1.3.5" - - python-version: "3.10" - pandas-version: "1.4.4" - - python-version: "3.8" - pandas-version: "2.0.3" - - python-version: "3.8" - pandas-version: "2.1.4" - python-version: "3.8" pandas-version: "2.2.2" diff --git a/noxfile.py b/noxfile.py index 420915d..e7910ca 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,11 +17,7 @@ def lint(session): [ (python, pandas) for python in ("3.8", "3.9", "3.10", "3.11") - for pandas in ("1.3.5", "1.4.4", "1.5.3", "2.0.3", "2.1.4", "2.2.2") - if (python, pandas) != ("3.10", "1.3.5") - if (python, pandas) != ("3.10", "1.4.4") - if (python, pandas) != ("3.8", "2.0.3") - if (python, pandas) != ("3.8", "2.1.4") + for pandas in ("1.5.3", "2.2.2") if (python, pandas) != ("3.8", "2.2.2") ], ) From 0b47b40211c24c85d20357b404f657d8e3bdffeb Mon Sep 17 00:00:00 2001 From: Tung Vu <53031642+tung-vu-td@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:01:51 +0700 Subject: [PATCH 8/8] Update suggested version for urllib3 Co-authored-by: Aki Ariga --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c26e990..534f873 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ classifiers = packages = find: python_requires = >=3.7,<3.12 install_requires = - urllib3~=1.26,>=1.21.1 + urllib3>=1.21.1 presto-python-client>=0.6.0 pandas>=1.3 td-client>=1.1.0