From 86fcea4b0f6dcdf1c365cb31d0bfd552108c543e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:23:25 -0800 Subject: [PATCH 1/8] Move adbc to conda forge --- ci/deps/actions-310.yaml | 4 ++-- ci/deps/actions-311-downstream_compat.yaml | 4 ++-- ci/deps/actions-311.yaml | 4 ++-- ci/deps/actions-312.yaml | 4 ++-- ci/deps/actions-39-minimum_versions.yaml | 4 ++-- ci/deps/actions-39.yaml | 4 ++-- ci/deps/circle-310-arm64.yaml | 5 ++--- environment.yml | 4 ++-- requirements-dev.txt | 4 ++-- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 4b62ecc79e4ef..6827d883b039c 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 95c0319d6f5b8..d9b16723300c3 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -25,6 +25,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -72,7 +74,5 @@ dependencies: - pyyaml - py - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - dataframe-api-compat>=0.1.7 - tzdata>=2022.7 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 52074ae00ea18..00a225d5e4ae3 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 4c51e9e6029e3..4c234748b06bc 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index fd71315d2e7ac..2025c64c3d7d7 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -26,6 +26,8 @@ dependencies: - pytz=2020.1 # optional dependencies + - adbc-driver-postgresql=0.8.0 + - adbc-driver-sqlite=0.8.0 - beautifulsoup4=4.11.2 - blosc=1.21.3 - bottleneck=1.3.6 @@ -60,7 +62,5 @@ dependencies: - zstandard=0.19.0 - pip: - - adbc-driver-postgresql==0.8.0 - - adbc-driver-sqlite==0.8.0 - dataframe-api-compat==0.1.7 - tzdata==2022.7 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index cbe8f77c15730..614fae94ad5b0 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 8e106445cd4e0..d1dda3d1f12db 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -56,6 +58,3 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=3.0.5 - zstandard>=0.19.0 - - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 diff --git a/environment.yml b/environment.yml index 3c95831593723..ff19cdd3d9300 100644 --- a/environment.yml +++ b/environment.yml @@ -26,6 +26,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc - bottleneck>=1.3.6 @@ -115,8 +117,6 @@ dependencies: - pygments # Code highlighting - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - dataframe-api-compat>=0.1.7 - sphinx-toggleprompt # conda-forge version has stricter pins on jinja2 - typing_extensions; python_version<"3.11" diff --git a/requirements-dev.txt b/requirements-dev.txt index 57e55ff31aa47..a7ad631d9336f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,6 +15,8 @@ coverage python-dateutil numpy<2 pytz +adbc-driver-postgresql>=0.8.0 +adbc-driver-sqlite>=0.8.0 beautifulsoup4>=4.11.2 blosc bottleneck>=1.3.6 @@ -83,8 +85,6 @@ feedparser pyyaml requests pygments -adbc-driver-postgresql>=0.8.0 -adbc-driver-sqlite>=0.8.0 dataframe-api-compat>=0.1.7 sphinx-toggleprompt typing_extensions; python_version<"3.11" From 30113df128045fb20573d0db0fc366db66c5b9f0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:33:48 -0800 Subject: [PATCH 2/8] Bump asv, flake8, pre-commit --- environment.yml | 12 ++++++------ requirements-dev.txt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/environment.yml b/environment.yml index ff19cdd3d9300..9768d4dbf634d 100644 --- a/environment.yml +++ b/environment.yml @@ -70,17 +70,17 @@ dependencies: - flask # benchmarks - - asv>=0.5.1 + - asv>=0.6.1 ## The compiler packages are meta-packages and install the correct compiler (activation) packages on the respective platforms. - c-compiler - cxx-compiler # code checks - - flake8=6.0.0 # run in subprocess over docstring examples - - mypy=1.4.1 # pre-commit uses locally installed mypy + - flake8=6.1.0 # run in subprocess over docstring examples + - mypy=1.7.1 # pre-commit uses locally installed mypy - tokenize-rt # scripts/check_for_inconsistent_pandas_namespace.py - - pre-commit>=2.15.0 + - pre-commit>=3.5.0 # documentation - gitpython # obtain contributors from git for whatsnew @@ -100,12 +100,12 @@ dependencies: - types-setuptools # documentation (jupyter notebooks) - - nbconvert>=6.4.5 + - nbconvert>=7.11.0 - nbsphinx - pandoc - ipywidgets - nbformat - - notebook>=6.0.3 + - notebook>=7.0.6 - ipykernel # web diff --git a/requirements-dev.txt b/requirements-dev.txt index a7ad631d9336f..e2b6712b8a6ad 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -53,11 +53,11 @@ dask seaborn moto flask -asv>=0.5.1 -flake8==6.0.0 -mypy==1.4.1 +asv>=0.6.1 +flake8==6.1.0 +mypy==1.7.1 tokenize-rt -pre-commit>=2.15.0 +pre-commit>=3.5.0 gitpython gitdb google-auth @@ -73,12 +73,12 @@ types-PyMySQL types-pytz types-PyYAML types-setuptools -nbconvert>=6.4.5 +nbconvert>=7.11.0 nbsphinx pandoc ipywidgets nbformat -notebook>=6.0.3 +notebook>=7.0.6 ipykernel markdown feedparser From fae175ee43a432e343fc20b9c4863bc29fa8b4ff Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:34:07 -0800 Subject: [PATCH 3/8] Bump pyright --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 52463a462b785..5b625928f3ed0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -132,7 +132,7 @@ repos: types: [python] stages: [manual] additional_dependencies: &pyright_dependencies - - pyright@1.1.318 + - pyright@1.1.339 - id: pyright # note: assumes python env is setup and activated name: pyright reportGeneralTypeIssues From fa8ff255341c32d1fbfdf14eb56808cc8296f8b3 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:36:45 -0800 Subject: [PATCH 4/8] Undo pyright --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b625928f3ed0..52463a462b785 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -132,7 +132,7 @@ repos: types: [python] stages: [manual] additional_dependencies: &pyright_dependencies - - pyright@1.1.339 + - pyright@1.1.318 - id: pyright # note: assumes python env is setup and activated name: pyright reportGeneralTypeIssues From e71bf299dde4302d8c981c53a138dd3df979f254 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:44:06 -0800 Subject: [PATCH 5/8] Remove broken togglepromt --- environment.yml | 1 - requirements-dev.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/environment.yml b/environment.yml index 9768d4dbf634d..6f05fb7330d9f 100644 --- a/environment.yml +++ b/environment.yml @@ -118,6 +118,5 @@ dependencies: - pip: - dataframe-api-compat>=0.1.7 - - sphinx-toggleprompt # conda-forge version has stricter pins on jinja2 - typing_extensions; python_version<"3.11" - tzdata>=2022.7 diff --git a/requirements-dev.txt b/requirements-dev.txt index e2b6712b8a6ad..af44c8b658fd7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -86,6 +86,5 @@ pyyaml requests pygments dataframe-api-compat>=0.1.7 -sphinx-toggleprompt typing_extensions; python_version<"3.11" tzdata>=2022.7 From 24b2623063e2dd1591cb434bf0d223519d53eb69 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Sun, 10 Dec 2023 11:54:43 -0800 Subject: [PATCH 6/8] Remove togglepromt from extensions --- doc/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 3f35e88cf543a..dbc764c88a6f3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -58,7 +58,6 @@ "numpydoc", "sphinx_copybutton", "sphinx_design", - "sphinx_toggleprompt", "sphinx.ext.autodoc", "sphinx.ext.autosummary", "sphinx.ext.coverage", From af3b983b6b2052cdf4ac5fe8c8c7bf0e80883eca Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Dec 2023 10:29:23 -0800 Subject: [PATCH 7/8] Bump precommit, revert mypy --- environment.yml | 4 ++-- requirements-dev.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index 6f05fb7330d9f..2958dd45b88a7 100644 --- a/environment.yml +++ b/environment.yml @@ -78,9 +78,9 @@ dependencies: # code checks - flake8=6.1.0 # run in subprocess over docstring examples - - mypy=1.7.1 # pre-commit uses locally installed mypy + - mypy=1.4.1 # pre-commit uses locally installed mypy - tokenize-rt # scripts/check_for_inconsistent_pandas_namespace.py - - pre-commit>=3.5.0 + - pre-commit>=3.6.0 # documentation - gitpython # obtain contributors from git for whatsnew diff --git a/requirements-dev.txt b/requirements-dev.txt index af44c8b658fd7..11851e3816190 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -55,9 +55,9 @@ moto flask asv>=0.6.1 flake8==6.1.0 -mypy==1.7.1 +mypy==1.4.1 tokenize-rt -pre-commit>=3.5.0 +pre-commit>=3.6.0 gitpython gitdb google-auth From 958f360af828d1862c9d215cedb0fa5c6a75558a Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Mon, 11 Dec 2023 10:30:46 -0800 Subject: [PATCH 8/8] Revert "Move adbc to conda forge" This reverts commit 86fcea4b0f6dcdf1c365cb31d0bfd552108c543e. --- ci/deps/actions-310.yaml | 4 ++-- ci/deps/actions-311-downstream_compat.yaml | 4 ++-- ci/deps/actions-311.yaml | 4 ++-- ci/deps/actions-312.yaml | 4 ++-- ci/deps/actions-39-minimum_versions.yaml | 4 ++-- ci/deps/actions-39.yaml | 4 ++-- ci/deps/circle-310-arm64.yaml | 5 +++-- environment.yml | 4 ++-- requirements-dev.txt | 4 ++-- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 6827d883b039c..4b62ecc79e4ef 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -24,8 +24,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -60,4 +58,6 @@ dependencies: - zstandard>=0.19.0 - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index d9b16723300c3..95c0319d6f5b8 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -25,8 +25,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -74,5 +72,7 @@ dependencies: - pyyaml - py - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - dataframe-api-compat>=0.1.7 - tzdata>=2022.7 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 00a225d5e4ae3..52074ae00ea18 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -24,8 +24,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -60,4 +58,6 @@ dependencies: - zstandard>=0.19.0 - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 4c234748b06bc..4c51e9e6029e3 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -24,8 +24,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -60,4 +58,6 @@ dependencies: - zstandard>=0.19.0 - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index 2025c64c3d7d7..fd71315d2e7ac 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -26,8 +26,6 @@ dependencies: - pytz=2020.1 # optional dependencies - - adbc-driver-postgresql=0.8.0 - - adbc-driver-sqlite=0.8.0 - beautifulsoup4=4.11.2 - blosc=1.21.3 - bottleneck=1.3.6 @@ -62,5 +60,7 @@ dependencies: - zstandard=0.19.0 - pip: + - adbc-driver-postgresql==0.8.0 + - adbc-driver-sqlite==0.8.0 - dataframe-api-compat==0.1.7 - tzdata==2022.7 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 614fae94ad5b0..cbe8f77c15730 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -24,8 +24,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -60,4 +58,6 @@ dependencies: - zstandard>=0.19.0 - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index d1dda3d1f12db..8e106445cd4e0 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -24,8 +24,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -58,3 +56,6 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=3.0.5 - zstandard>=0.19.0 + - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 diff --git a/environment.yml b/environment.yml index 2958dd45b88a7..0014e71ed0804 100644 --- a/environment.yml +++ b/environment.yml @@ -26,8 +26,6 @@ dependencies: - pytz # optional dependencies - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc - bottleneck>=1.3.6 @@ -117,6 +115,8 @@ dependencies: - pygments # Code highlighting - pip: + - adbc-driver-postgresql>=0.8.0 + - adbc-driver-sqlite>=0.8.0 - dataframe-api-compat>=0.1.7 - typing_extensions; python_version<"3.11" - tzdata>=2022.7 diff --git a/requirements-dev.txt b/requirements-dev.txt index 11851e3816190..50a81fbff1b6a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,8 +15,6 @@ coverage python-dateutil numpy<2 pytz -adbc-driver-postgresql>=0.8.0 -adbc-driver-sqlite>=0.8.0 beautifulsoup4>=4.11.2 blosc bottleneck>=1.3.6 @@ -85,6 +83,8 @@ feedparser pyyaml requests pygments +adbc-driver-postgresql>=0.8.0 +adbc-driver-sqlite>=0.8.0 dataframe-api-compat>=0.1.7 typing_extensions; python_version<"3.11" tzdata>=2022.7