From fb0b19ff3f69026b69d7a9e77deb57351b689f64 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:21:48 -0400 Subject: [PATCH] Revert "CI: Pin blosc to fix pytables" (#58218) Revert "CI: Pin blosc to fix pytables (#58209)" This reverts commit b1525c4a3788d161653b04a71a84e44847bedc1b. --- ci/deps/actions-310.yaml | 2 -- ci/deps/actions-311-downstream_compat.yaml | 2 -- ci/deps/actions-311.yaml | 2 -- ci/deps/actions-312.yaml | 2 -- ci/deps/actions-39-minimum_versions.yaml | 2 -- ci/deps/actions-39.yaml | 2 -- ci/deps/circle-310-arm64.yaml | 2 -- environment.yml | 2 -- scripts/generate_pip_deps_from_conda.py | 2 +- scripts/validate_min_versions_in_sync.py | 5 +---- 10 files changed, 2 insertions(+), 21 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ea2336ae78f814..a3e44e63731456 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -24,8 +24,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 8f84a53b586104..d6bf9ec7843def 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -26,8 +26,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 51a246ce73a112..95cd1a4d46ef47 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -24,8 +24,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 7d2b9c39d2fe3d..a442ed6feeb5db 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -24,8 +24,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index cedf4fb9dc8672..7067048c4434d0 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -27,8 +27,6 @@ dependencies: # optional dependencies - beautifulsoup4=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc=1.21.3 - bottleneck=1.3.6 - fastparquet=2022.12.0 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 85f2a74e849eec..b162a78e7f1157 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -24,8 +24,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index c018ad94e7f30d..a19ffd485262d2 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -25,8 +25,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc>=1.21.3 - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/environment.yml b/environment.yml index aef3ce66ff352e..30c078051d330a 100644 --- a/environment.yml +++ b/environment.yml @@ -27,8 +27,6 @@ dependencies: # optional dependencies - beautifulsoup4>=4.11.2 - # https://github.com/conda-forge/pytables-feedstock/issues/97 - - c-blosc2=2.13.2 - blosc - bottleneck>=1.3.6 - fastparquet>=2022.12.0 diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index bf38d2fa419d12..5fcf09cd073fef 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -23,7 +23,7 @@ import tomli as tomllib import yaml -EXCLUDE = {"python", "c-compiler", "cxx-compiler", "c-blosc2"} +EXCLUDE = {"python", "c-compiler", "cxx-compiler"} REMAP_VERSION = {"tzdata": "2022.7"} CONDA_TO_PIP = { "pytables": "tables", diff --git a/scripts/validate_min_versions_in_sync.py b/scripts/validate_min_versions_in_sync.py index 62a92cdd10ebc9..7dd3e96e6ec18a 100755 --- a/scripts/validate_min_versions_in_sync.py +++ b/scripts/validate_min_versions_in_sync.py @@ -36,7 +36,7 @@ SETUP_PATH = pathlib.Path("pyproject.toml").resolve() YAML_PATH = pathlib.Path("ci/deps") ENV_PATH = pathlib.Path("environment.yml") -EXCLUDE_DEPS = {"tzdata", "blosc", "c-blosc2", "pandas-gbq", "pyqt", "pyqt5"} +EXCLUDE_DEPS = {"tzdata", "blosc", "pandas-gbq", "pyqt", "pyqt5"} EXCLUSION_LIST = frozenset(["python=3.8[build=*_pypy]"]) # pandas package is not available # in pre-commit environment @@ -225,9 +225,6 @@ def get_versions_from_ci(content: list[str]) -> tuple[dict[str, str], dict[str, seen_required = True elif "# optional dependencies" in line: seen_optional = True - elif "#" in line: - # just a comment - continue elif "- pip:" in line: continue elif seen_required and line.strip():