Not giving up

WorldCereal · Sep 30, 2024 · 9657518 · 9657518
1 parent 1dee04a
commit 9657518
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/presto/resources/__init__.py b/presto/resources/__init__.py
diff --git a/...s/croptype_mappings/croptype_classes.json → presto/resources/croptype_classes.json b/...s/croptype_mappings/croptype_classes.json → presto/resources/croptype_classes.json
diff --git a/presto/utils.py b/presto/utils.py
@@ -14,6 +14,8 @@
 import torch
 import xarray as xr
 
+from presto import resources
+
 from .dataops import (
     BANDS,
     ERA5_BANDS,
@@ -37,9 +39,7 @@
 DEFAULT_SEED: int = 42
 
 
-with importlib.resources.open_binary(
-    "presto.resources.croptype_mappings", "croptype_classes.json"
-) as f:
+with importlib.resources.open_binary(resources, "croptype_classes.json") as f:
     CLASS_MAPPINGS = json.load(f)
 
 

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def load_dependencies(tag: str) -> List[str]:
     python_requires=">=3.8",
     include_package_data=True,
     package_data={
-        "presto.resources.croptype_mappings": ["*.json"],
+        "": ["resources/**/*"],
     },
     zip_safe=True,
 )
diff --git a/tests/test_resources.py b/tests/test_resources.py
@@ -2,12 +2,12 @@
 import json
 from unittest import TestCase
 
+from presto import resources
+
 
 class TestResources(TestCase):
     def test_load_class_mappings(self):
-        with importlib.resources.open_binary(
-            "presto.resources.croptype_mappings", "croptype_classes.json"
-        ) as f:
+        with importlib.resources.open_binary(resources, "croptype_classes.json") as f:
             CLASS_MAPPINGS = json.load(f)
 
             assert CLASS_MAPPINGS is not None