From 042cdcf7615e8f9ccdd10e282cb891bc53ecc8e9 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:29:15 -0400 Subject: [PATCH 1/2] CI: Pin blosc to fix pytables --- 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 ++ requirements-dev.txt | 1 + scripts/validate_min_versions_in_sync.py | 5 ++++- 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ed7dfe1a3c17e..7402f6495c788 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -24,6 +24,8 @@ 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>=2023.10.0 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index dd1d341c70a9b..15ff3d6dbe54c 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -26,6 +26,8 @@ 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>=2023.10.0 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 388116439f944..586cf26da7897 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -24,6 +24,8 @@ 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>=2023.10.0 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 1d9f8aa3b092a..96abc7744d871 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -24,6 +24,8 @@ 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>=2023.10.0 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index b760f27a3d4d3..4756f1046054d 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -27,6 +27,8 @@ 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=2023.10.0 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 8f235a836bb3d..8154486ff53e1 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -24,6 +24,8 @@ 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>=2023.10.0 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index ed4d139714e71..dc6adf175779f 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -25,6 +25,8 @@ 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>=2023.10.0 diff --git a/environment.yml b/environment.yml index 186d7e1d703df..ac4bd0568403b 100644 --- a/environment.yml +++ b/environment.yml @@ -28,6 +28,8 @@ 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>=2023.10.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index a42ee1587961a..61e6938626df7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -17,6 +17,7 @@ python-dateutil numpy<2 pytz beautifulsoup4>=4.11.2 +c-blosc2==2.13.2 blosc bottleneck>=1.3.6 fastparquet>=2023.10.0 diff --git a/scripts/validate_min_versions_in_sync.py b/scripts/validate_min_versions_in_sync.py index 1001b00450354..59989aadf73ae 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", "pyqt", "pyqt5"} +EXCLUDE_DEPS = {"tzdata", "blosc", "c-blosc2", "pyqt", "pyqt5"} EXCLUSION_LIST = frozenset(["python=3.8[build=*_pypy]"]) # pandas package is not available # in pre-commit environment @@ -225,6 +225,9 @@ 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(): From 5e93d3828970861d5ec5750bdf84bf310e3e8893 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:33:34 -0400 Subject: [PATCH 2/2] remove from requirements-dev.txt --- requirements-dev.txt | 1 - scripts/generate_pip_deps_from_conda.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 61e6938626df7..a42ee1587961a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -17,7 +17,6 @@ python-dateutil numpy<2 pytz beautifulsoup4>=4.11.2 -c-blosc2==2.13.2 blosc bottleneck>=1.3.6 fastparquet>=2023.10.0 diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index d54d35bc0171f..4e4e54c5be9a9 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"} +EXCLUDE = {"python", "c-compiler", "cxx-compiler", "c-blosc2"} REMAP_VERSION = {"tzdata": "2022.7"} CONDA_TO_PIP = { "pytables": "tables",