Skip to content

CI: Add missing dependencies for skipped tests #46260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 11, 2022
Merged

CI: Add missing dependencies for skipped tests #46260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de340b7
CI: Add missing dependency for skipped tests
mroeschke Mar 8, 2022
f9f120c
Make exception for brotili
mroeschke Mar 8, 2022
4fdd58c
Check name instead
mroeschke Mar 8, 2022
cc4075f
Consolidate brotli version logic
mroeschke Mar 8, 2022
f73cd9a
Fix typing
mroeschke Mar 8, 2022
415793a
reformat table
mroeschke Mar 8, 2022
6ec589b
Merge remote-tracking branch 'upstream/main' into ci/missing_deps
mroeschke Mar 9, 2022
75a9a2e
Merge remote-tracking branch 'upstream/main' into ci/missing_deps
mroeschke Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ci/deps/actions-310.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies:
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil
- pytest-asyncio
- boto3

# required dependencies
- python-dateutil
Expand All @@ -21,6 +23,7 @@ dependencies:
- beautifulsoup4
- blosc
- bottleneck
- brotlipy
- fastparquet
- fsspec
- html5lib
Expand All @@ -42,6 +45,7 @@ dependencies:
- pyxlsb
- s3fs
- scipy
- snappy
- sqlalchemy
- tabulate
- xarray
Expand Down
7 changes: 4 additions & 3 deletions ci/deps/actions-38-downstream_compat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dependencies:
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil
- pytest-asyncio
- boto3

# required dependencies
- python-dateutil
Expand All @@ -21,6 +23,7 @@ dependencies:
# optional dependencies
- beautifulsoup4
- blosc
- brotlipy
- bottleneck
- fastparquet
- fsspec
Expand All @@ -42,6 +45,7 @@ dependencies:
- pyxlsb
- s3fs
- scipy
- snappy
- sqlalchemy
- tabulate
- xarray
Expand All @@ -52,17 +56,14 @@ dependencies:

# downstream packages
- aiobotocore
- boto3
- botocore
- cftime
- dask
- ipython
- geopandas
- python-snappy
- seaborn
- scikit-learn
- statsmodels
- brotlipy
- coverage
- pandas-datareader
- pyyaml
Expand Down
4 changes: 4 additions & 0 deletions ci/deps/actions-38-minimum_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ dependencies:
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil
- pytest-asyncio
- boto3

# required dependencies
- python-dateutil=2.8.1
Expand All @@ -23,6 +25,7 @@ dependencies:
- beautifulsoup4=4.8.2
- blosc=1.20.1
- bottleneck=1.3.1
- brotlipy=0.7.0
- fastparquet=0.4.0
- fsspec=0.7.4
- html5lib=1.1
Expand All @@ -44,6 +47,7 @@ dependencies:
- pyxlsb=1.0.6
- s3fs=0.4.0
- scipy=1.4.1
- snappy=1.1.8
- sqlalchemy=1.4.0
- tabulate=0.8.7
- xarray=0.15.1
Expand Down
4 changes: 4 additions & 0 deletions ci/deps/actions-38.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies:
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil
- pytest-asyncio
- boto3

# required dependencies
- python-dateutil
Expand All @@ -21,6 +23,7 @@ dependencies:
- beautifulsoup4
- blosc
- bottleneck
- brotlipy
- fastparquet
- fsspec
- html5lib
Expand All @@ -41,6 +44,7 @@ dependencies:
- pyxlsb
- s3fs
- scipy
- snappy
- sqlalchemy
- tabulate
- xarray
Expand Down
4 changes: 4 additions & 0 deletions ci/deps/actions-39.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies:
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil
- pytest-asyncio
- boto3

# required dependencies
- python-dateutil
Expand All @@ -21,6 +23,7 @@ dependencies:
- beautifulsoup4
- blosc
- bottleneck
- brotlipy
- fastparquet
- fsspec
- html5lib
Expand All @@ -41,6 +44,7 @@ dependencies:
- pyxlsb
- s3fs
- scipy
- snappy
- sqlalchemy
- tabulate
- xarray
Expand Down
4 changes: 3 additions & 1 deletion doc/source/getting_started/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,5 +410,7 @@ Compression
========================= ================== =============================================================
Dependency Minimum Version Notes
========================= ================== =============================================================
Zstandard Zstandard compression
brotli 0.7.0 Brotli compression
snappy 1.1.8 Snappy compression
Zstandard 0.15.2 Zstandard compression
========================= ================== =============================================================
8 changes: 7 additions & 1 deletion pandas/compat/_optional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"bs4": "4.8.2",
"blosc": "1.20.1",
"bottleneck": "1.3.1",
"brotli": "0.7.0",
"fastparquet": "0.4.0",
"fsspec": "0.7.4",
"html5lib": "1.1",
Expand All @@ -34,6 +35,7 @@
"pyxlsb": "1.0.6",
"s3fs": "0.4.0",
"scipy": "1.4.1",
"snappy": "1.1.8",
"sqlalchemy": "1.4.0",
"tables": "3.6.1",
"tabulate": "0.8.7",
Expand All @@ -50,6 +52,7 @@
INSTALL_MAPPING = {
"bs4": "beautifulsoup4",
"bottleneck": "Bottleneck",
"brotli": "brotlipy",
"lxml.etree": "lxml",
"odf": "odfpy",
"pandas_gbq": "pandas-gbq",
Expand All @@ -66,6 +69,9 @@ def get_version(module: types.ModuleType) -> str:
version = getattr(module, "__VERSION__", None)

if version is None:
if module.__name__ == "brotli":
# brotli doesn't contain attributes to confirm it's version
return ""
raise ImportError(f"Can't determine version for {module.__name__}")
if module.__name__ == "psycopg2":
# psycopg2 appends " (dt dec pq3 ext lo64)" to it's version
Expand Down Expand Up @@ -141,7 +147,7 @@ def import_optional_dependency(
minimum_version = min_version if min_version is not None else VERSIONS.get(parent)
if minimum_version:
version = get_version(module_to_get)
if Version(version) < Version(minimum_version):
if version and Version(version) < Version(minimum_version):
msg = (
f"Pandas requires version '{minimum_version}' or newer of '{parent}' "
f"(version '{version}' currently installed)."
Expand Down