Skip to content

Commit

Permalink
Revert "CI: Pin blosc to fix pytables" (pandas-dev#58218)
Browse files Browse the repository at this point in the history
Revert "CI: Pin blosc to fix pytables (pandas-dev#58209)"

This reverts commit b1525c4.
  • Loading branch information
lithomas1 authored and WillAyd committed Aug 22, 2024
1 parent dc47602 commit 3223070
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 21 deletions.
2 changes: 0 additions & 2 deletions ci/deps/actions-310.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/actions-311-downstream_compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/actions-311.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/actions-312.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/actions-39-minimum_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/actions-39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ci/deps/circle-310-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_pip_deps_from_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions scripts/validate_min_versions_in_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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():
Expand Down

0 comments on commit 3223070

Please sign in to comment.