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] 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