Merge pull request #216 from randovania/feature/zstd

Swap dependency from zstd to zstandard
randovania · Aug 29, 2024 · af155fd · af155fd
2 parents 8f54c95 + dc28d62
commit af155fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ requires = [
     "setuptools_scm[toml]>=3.4.3",
     "construct>=2.10.0",
     "randovania-lupa>=2.0.1",
-    "zstd",
+    "zstandard",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -24,7 +24,7 @@ dynamic = ["version"]
 dependencies = [
     "construct>=2.10.70",  # 2.10.70 includes a fix for compiled structs building
     "randovania-lupa>=2.0.1",
-    "zstd",
+    "zstandard",
 ]
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -24,5 +24,5 @@ pytest-cov==5.0.0
     # via mercury-engine-data-structures (setup.py)
 randovania-lupa==2.0.1
     # via mercury-engine-data-structures (setup.py)
-zstd==1.5.5.1
+zstandard==0.23.0
     # via mercury-engine-data-structures (setup.py)
diff --git a/src/mercury_engine_data_structures/_dread_data_construct.py b/src/mercury_engine_data_structures/_dread_data_construct.py
@@ -7,9 +7,9 @@
 class CompressedZSTD(construct.Tunnel):
     def __init__(self, subcon, level: int = 3):
         super().__init__(subcon)
-        import zstd
+        import zstandard
 
-        self.lib = zstd
+        self.lib = zstandard
         self.level = level
 
     def _decode(self, data, context, path):