Skip to content

Commit 8b6a82f

Browse files
authored
Revert "CI: Pin blosc to fix pytables" (#58218)
Revert "CI: Pin blosc to fix pytables (#58209)" This reverts commit b1525c4.
1 parent ad5874d commit 8b6a82f

10 files changed

+2
-21
lines changed

ci/deps/actions-310.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ dependencies:
2424

2525
# optional dependencies
2626
- beautifulsoup4>=4.11.2
27-
# https://github.com/conda-forge/pytables-feedstock/issues/97
28-
- c-blosc2=2.13.2
2927
- blosc>=1.21.3
3028
- bottleneck>=1.3.6
3129
- fastparquet>=2023.10.0

ci/deps/actions-311-downstream_compat.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ dependencies:
2626

2727
# optional dependencies
2828
- beautifulsoup4>=4.11.2
29-
# https://github.com/conda-forge/pytables-feedstock/issues/97
30-
- c-blosc2=2.13.2
3129
- blosc>=1.21.3
3230
- bottleneck>=1.3.6
3331
- fastparquet>=2023.10.0

ci/deps/actions-311.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ dependencies:
2424

2525
# optional dependencies
2626
- beautifulsoup4>=4.11.2
27-
# https://github.com/conda-forge/pytables-feedstock/issues/97
28-
- c-blosc2=2.13.2
2927
- blosc>=1.21.3
3028
- bottleneck>=1.3.6
3129
- fastparquet>=2023.10.0

ci/deps/actions-312.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ dependencies:
2424

2525
# optional dependencies
2626
- beautifulsoup4>=4.11.2
27-
# https://github.com/conda-forge/pytables-feedstock/issues/97
28-
- c-blosc2=2.13.2
2927
- blosc>=1.21.3
3028
- bottleneck>=1.3.6
3129
- fastparquet>=2023.10.0

ci/deps/actions-39-minimum_versions.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ dependencies:
2727

2828
# optional dependencies
2929
- beautifulsoup4=4.11.2
30-
# https://github.com/conda-forge/pytables-feedstock/issues/97
31-
- c-blosc2=2.13.2
3230
- blosc=1.21.3
3331
- bottleneck=1.3.6
3432
- fastparquet=2023.10.0

ci/deps/actions-39.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ dependencies:
2424

2525
# optional dependencies
2626
- beautifulsoup4>=4.11.2
27-
# https://github.com/conda-forge/pytables-feedstock/issues/97
28-
- c-blosc2=2.13.2
2927
- blosc>=1.21.3
3028
- bottleneck>=1.3.6
3129
- fastparquet>=2023.10.0

ci/deps/circle-310-arm64.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ dependencies:
2525

2626
# optional dependencies
2727
- beautifulsoup4>=4.11.2
28-
# https://github.com/conda-forge/pytables-feedstock/issues/97
29-
- c-blosc2=2.13.2
3028
- blosc>=1.21.3
3129
- bottleneck>=1.3.6
3230
- fastparquet>=2023.10.0

environment.yml

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ dependencies:
2828

2929
# optional dependencies
3030
- beautifulsoup4>=4.11.2
31-
# https://github.com/conda-forge/pytables-feedstock/issues/97
32-
- c-blosc2=2.13.2
3331
- blosc
3432
- bottleneck>=1.3.6
3533
- fastparquet>=2023.10.0

scripts/generate_pip_deps_from_conda.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import tomli as tomllib
2424
import yaml
2525

26-
EXCLUDE = {"python", "c-compiler", "cxx-compiler", "c-blosc2"}
26+
EXCLUDE = {"python", "c-compiler", "cxx-compiler"}
2727
REMAP_VERSION = {"tzdata": "2022.7"}
2828
CONDA_TO_PIP = {
2929
"pytables": "tables",

scripts/validate_min_versions_in_sync.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
SETUP_PATH = pathlib.Path("pyproject.toml").resolve()
3737
YAML_PATH = pathlib.Path("ci/deps")
3838
ENV_PATH = pathlib.Path("environment.yml")
39-
EXCLUDE_DEPS = {"tzdata", "blosc", "c-blosc2", "pyqt", "pyqt5"}
39+
EXCLUDE_DEPS = {"tzdata", "blosc", "pyqt", "pyqt5"}
4040
EXCLUSION_LIST = frozenset(["python=3.8[build=*_pypy]"])
4141
# pandas package is not available
4242
# in pre-commit environment
@@ -225,9 +225,6 @@ def get_versions_from_ci(content: list[str]) -> tuple[dict[str, str], dict[str,
225225
seen_required = True
226226
elif "# optional dependencies" in line:
227227
seen_optional = True
228-
elif "#" in line:
229-
# just a comment
230-
continue
231228
elif "- pip:" in line:
232229
continue
233230
elif seen_required and line.strip():

0 commit comments

Comments
 (0)