polytope-python 2.0.2__tar.gz → 2.0.4__tar.gz

{polytope_python-2.0.2/polytope_python.egg-info → polytope_python-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.0.2
+Version: 2.0.4
 Summary: Polytope datacube feature extraction library
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 Maintainer-email: James Hawkes <James.Hawkes@ecmwf.int>, Mathilde Leuridan <Mathilde.Leuridan@ecmwf.int>
@@ -41,6 +41,10 @@ Requires-Dist: h5py; extra == "tests"
 Requires-Dist: earthkit-data; extra == "tests"
 Requires-Dist: matplotlib; extra == "tests"
 Requires-Dist: pyfdb; extra == "tests"
+Provides-Extra: unstructured
+Requires-Dist: eckit; extra == "unstructured"
+Provides-Extra: catalogue
+Requires-Dist: qubed; extra == "catalogue"
 Dynamic: license-file
 
 

{polytope_python-2.0.2 → polytope_python-2.0.4}/polytope_feature/_version.py

@@ -1,2 +1,2 @@
 # Do not change! Do not track in version control!
-__version__ = "2.0.2"
+__version__ = "2.0.4"

{polytope_python-2.0.2 → polytope_python-2.0.4}/polytope_feature/datacube/backends/fdb.py

@@ -5,7 +5,6 @@ from itertools import product
 
 from ...utility.exceptions import BadGridError, BadRequestError, GribJumpNoIndexError
 from ...utility.geometry import nearest_pt
-from .catalogue_helper import find_axes_from_qube
 from .datacube import Datacube, TensorIndexTree
 
 
@@ -42,6 +41,8 @@ class FDBDatacube(Datacube):
         self.gj = gj
         if len(alternative_axes) == 0:
             if self.use_catalogue:
+                from .catalogue_helper import find_axes_from_qube
+
                 logging.info("Find GribJump axes for %s from catalogue", context)
                 self.fdb_coordinates = find_axes_from_qube(partial_request)
                 logging.info("Retrieved available GribJump axes for %s", context)

{polytope_python-2.0.2 → polytope_python-2.0.4}/polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/icon.py

@@ -19,26 +19,23 @@ class ICONGridMapper(IrregularGridMapper):
         self._resolution = resolution
         self._axis_reversed = False
         self.compressed_grid_axes = [self._mapped_axes[1]]
+        self.uuid = mapper_options.uuid
         if md5_hash is not None:
             self.md5_hash = md5_hash
         else:
-            self.md5_hash = _md5_hash.get(resolution, None)
+            self.md5_hash = _md5_hash.get(self.uuid, None)
 
-        self.uuid = mapper_options.uuid
         self.is_irregular = True
 
     def grid_latlon_points(self):
 
         grid = Grid({"grid": self.uuid})
 
-        print(grid)
-
         latlons = grid.to_latlons()
         latitudes = latlons[0]
         longitudes = latlons[1]
 
         points = list(zip(latitudes, longitudes))
-        print(len(points))
         return points
 
 

{polytope_python-2.0.2 → polytope_python-2.0.4/polytope_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.0.2
+Version: 2.0.4
 Summary: Polytope datacube feature extraction library
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 Maintainer-email: James Hawkes <James.Hawkes@ecmwf.int>, Mathilde Leuridan <Mathilde.Leuridan@ecmwf.int>
@@ -41,6 +41,10 @@ Requires-Dist: h5py; extra == "tests"
 Requires-Dist: earthkit-data; extra == "tests"
 Requires-Dist: matplotlib; extra == "tests"
 Requires-Dist: pyfdb; extra == "tests"
+Provides-Extra: unstructured
+Requires-Dist: eckit; extra == "unstructured"
+Provides-Extra: catalogue
+Requires-Dist: qubed; extra == "catalogue"
 Dynamic: license-file
 
 

{polytope_python-2.0.2 → polytope_python-2.0.4}/polytope_python.egg-info/requires.txt

@@ -7,6 +7,9 @@ xarray
 conflator
 protobuf
 
+[catalogue]
+qubed
+
 [tests]
 pytest
 pytest-cov
@@ -17,3 +20,6 @@ h5py
 earthkit-data
 matplotlib
 pyfdb
+
+[unstructured]
+eckit

{polytope_python-2.0.2 → polytope_python-2.0.4}/pyproject.toml

@@ -54,6 +54,14 @@ tests = [
     "pyfdb"
 ]
 
+unstructured = [
+    "eckit"
+]
+
+catalogue = [
+    "qubed"
+]
+
 [project.urls]
 repository = "https://github.com/ecmwf/polytope"
 documentation = "https://polytope.readthedocs.io/en/latest/"

{polytope_python-2.0.2 → polytope_python-2.0.4}/tests/test_icon_grid_unstructured_fdb.py

@@ -34,7 +34,6 @@ class TestQuadTreeSlicer:
                         {
                             "name": "mapper",
                             "type": "icon",
-                            "resolution": 0,
                             "axes": ["latitude", "longitude"],
                             "md5_hash": "f68071a8ac9bae4e965822afb963c04f",
                             "uuid": uuid,