Skip to content

Commit 7143c44

Browse files
authored
Fix snappy version (#46347)
1 parent c1e3f49 commit 7143c44

File tree

7 files changed

+21
-16
lines changed

7 files changed

+21
-16
lines changed

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ dependencies:
4242
- pytables
4343
- pyarrow
4444
- pyreadstat
45+
- python-snappy
4546
- pyxlsb
4647
- s3fs
4748
- scipy
48-
- snappy
4949
- sqlalchemy
5050
- tabulate
5151
- xarray

ci/deps/actions-38-downstream_compat.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ dependencies:
3838
- odfpy
3939
- pandas-gbq
4040
- psycopg2
41-
- pymysql
42-
- pytables
4341
- pyarrow
42+
- pymysql
4443
- pyreadstat
44+
- pytables
45+
- python-snappy
4546
- pyxlsb
4647
- s3fs
4748
- scipy
48-
- snappy
4949
- sqlalchemy
5050
- tabulate
5151
- xarray

ci/deps/actions-38-minimum_versions.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ dependencies:
4040
- openpyxl=3.0.3
4141
- pandas-gbq=0.14.0
4242
- psycopg2=2.8.4
43-
- pymysql=0.10.1
44-
- pytables=3.6.1
4543
- pyarrow=1.0.1
44+
- pymysql=0.10.1
4645
- pyreadstat=1.1.0
46+
- pytables=3.6.1
47+
- python-snappy=0.6.0
4748
- pyxlsb=1.0.6
4849
- s3fs=0.4.0
4950
- scipy=1.4.1
50-
- snappy=1.1.8
5151
- sqlalchemy=1.4.0
5252
- tabulate=0.8.7
5353
- xarray=0.15.1

ci/deps/actions-38.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ dependencies:
3737
- odfpy
3838
- pandas-gbq
3939
- psycopg2
40-
- pymysql
41-
- pytables
4240
- pyarrow
41+
- pymysql
4342
- pyreadstat
43+
- pytables
44+
- python-snappy
4445
- pyxlsb
4546
- s3fs
4647
- scipy
47-
- snappy
4848
- sqlalchemy
4949
- tabulate
5050
- xarray

ci/deps/actions-39.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ dependencies:
3838
- pandas-gbq
3939
- psycopg2
4040
- pymysql
41-
- pytables
4241
- pyarrow
4342
- pyreadstat
43+
- pytables
44+
- python-snappy
4445
- pyxlsb
4546
- s3fs
4647
- scipy
47-
- snappy
4848
- sqlalchemy
4949
- tabulate
5050
- xarray

doc/source/getting_started/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,6 @@ Compression
411411
Dependency Minimum Version Notes
412412
========================= ================== =============================================================
413413
brotli 0.7.0 Brotli compression
414-
snappy 1.1.8 Snappy compression
414+
python-snappy 0.6.0 Snappy compression
415415
Zstandard 0.15.2 Zstandard compression
416416
========================= ================== =============================================================

pandas/compat/_optional.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"pyxlsb": "1.0.6",
3636
"s3fs": "0.4.0",
3737
"scipy": "1.4.1",
38-
"snappy": "1.1.8",
38+
"snappy": "0.6.0",
3939
"sqlalchemy": "1.4.0",
4040
"tables": "3.6.1",
4141
"tabulate": "0.8.7",
@@ -53,12 +53,13 @@
5353
"bs4": "beautifulsoup4",
5454
"bottleneck": "Bottleneck",
5555
"brotli": "brotlipy",
56+
"jinja2": "Jinja2",
5657
"lxml.etree": "lxml",
5758
"odf": "odfpy",
5859
"pandas_gbq": "pandas-gbq",
59-
"tables": "pytables",
60+
"snappy": "python-snappy",
6061
"sqlalchemy": "SQLAlchemy",
61-
"jinja2": "Jinja2",
62+
"tables": "pytables",
6263
}
6364

6465

@@ -72,6 +73,10 @@ def get_version(module: types.ModuleType) -> str:
7273
if module.__name__ == "brotli":
7374
# brotli doesn't contain attributes to confirm it's version
7475
return ""
76+
if module.__name__ == "snappy":
77+
# snappy doesn't contain attributes to confirm it's version
78+
# See https://github.com/andrix/python-snappy/pull/119
79+
return ""
7580
raise ImportError(f"Can't determine version for {module.__name__}")
7681
if module.__name__ == "psycopg2":
7782
# psycopg2 appends " (dt dec pq3 ext lo64)" to it's version

0 commit comments

Comments
 (0)