muninn 7.0__tar.gz → 7.0.2__tar.gz

{muninn-7.0 → muninn-7.0.2}/CHANGES

@@ -1,3 +1,19 @@
+7.0.2 2025-10-10
+~~~~~~~~~~~~~~~~
+
+* Fixed issue where a Geometry Linearring could not be closed or had a
+  duplicate closing point.
+
+7.0.1 2025-08-25
+~~~~~~~~~~~~~~~~
+
+* Fixed incorrect unit of sizes >= Petabyte for the -H command line option.
+
+* 'muninn-search --path' now shows the content of remote_url if a product
+  is not in the archive. A leading file:// in the remote_url is then omitted.
+
+* Allow muninn-sync start/end arguments to be a date+time argument.
+
 7.0 2025-08-14
 ~~~~~~~~~~~~~~
 

{muninn-7.0 → muninn-7.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: muninn
-Version: 7.0
+Version: 7.0.2
 Summary: Data product catalogue and archive system
 Home-page: https://github.com/stcorp/muninn
 Author: S[&]T
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering

{muninn-7.0 → muninn-7.0.2}/muninn/__init__.py

@@ -4,7 +4,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-__version__ = "7.0.0"
+__version__ = "7.0.2"
 __copyright__ = "Copyright (C) 2014-2025 S[&]T, The Netherlands."
 
 __all__ = ["Error", "InternalError", "Struct", "Archive", "open", "config_path"]

{muninn-7.0 → muninn-7.0.2}/muninn/archive.py

@@ -96,7 +96,7 @@ def _load_synchronizer_module(name):
     try:
         __import__(name)
     except ImportError as e:
-        raise Error("import of syncrhonizer %r failed (%s)" % (name, e))
+        raise Error("import of synchronizer %r failed (%s)" % (name, e))
 
     return sys.modules[name]
 
@@ -1314,8 +1314,11 @@ class Archive(object):
         if archive_path is not None and self._storage is not None:
             product_path = self._product_path(product)
             return os.path.join(self._storage.global_prefix, product_path)
-        elif remote_url is not None:
+        if remote_url is not None:
+            if remote_url.startswith('file://'):
+                return remote_url[7:]
             return remote_url
+        return None
 
     def pull(self, where="", parameters={}, verify_hash=False, verify_hash_download=False):
         """Pull one or more remote products into the archive.

{muninn-7.0 → muninn-7.0.2}/muninn/geometry.py

@@ -284,10 +284,15 @@ class LineString(GeometrySequence):
 
 class LinearRing(GeometrySequence):
     def __init__(self, geometries=[]):
+        geometries = list(geometries)
+        if len(geometries) > 1 and geometries[0] != geometries[-1]:
+            # close the ring
+            geometries.append(geometries[0])
+
         super(LinearRing, self).__init__(geometries)
 
-        if self and len(self) < 3:
-            raise ValueError("linear ring should be empty or should contain >= 3 points")
+        if self and len(self) < 4:
+            raise ValueError("linear ring should be empty or should contain >= 4 points")
 
     def point(self, index):
         return self[index]
@@ -296,8 +301,7 @@ class LinearRing(GeometrySequence):
         if not self:
             wkt = "EMPTY"
         else:
-            wkt = "(%s, %f %f)" % (", ".join(["%f %f" % (point.x, point.y) for point in self]), self.point(0).x,
-                                   self.point(0).y)
+            wkt = "("  + ", ".join(["%f %f" % (point.x, point.y) for point in self]) + ")"
         return "LINESTRING " + wkt if tagged else wkt
 
     def __repr__(self):
@@ -421,7 +425,8 @@ class Polygon(GeometrySequence):
                     del crossing_lat[min_index]
         for pts in pts_set:
             # close ring
-            pts.append(pts[0])
+            if pts[0] != pts[-1]:
+                pts.append(pts[0])
         if len(pts_set) == 1:
             return Polygon([LinearRing(pts)])
         else:

{muninn-7.0 → muninn-7.0.2}/muninn/language.py

@@ -485,7 +485,7 @@ def parse_linear_ring(stream):
     if points[-1] != points[0]:
         raise Error("char %d: linear ring should be closed" % stream.token_start_position)
 
-    return geometry.LinearRing(points[:-1])
+    return geometry.LinearRing(points)
 
 
 def parse_polygon(stream):

{muninn-7.0 → muninn-7.0.2}/muninn/tools/search.py

@@ -121,12 +121,12 @@ def uuid(args):
 def paths(args):
     with muninn.open(args.archive) as archive:
         # Collect possibly multiple sort order specifier lists into a single list.
-        order_by_default = ['+core.archive_path', '+core.physical_name']
+        order_by_default = ['+core.archive_path', '+core.physical_name', '+core.remote_url']
         order_by = order_by_default if not args.order_by else sum(args.order_by, []) + order_by_default
 
         # Find products using the search expression and print the paths of the products found.
         products = archive.search(args.expression, order_by, args.limit,
-                                  property_names=['archive_path', 'physical_name'])
+                                  property_names=['archive_path', 'physical_name', 'remote_url'])
         for product in products:
             product_path = archive.product_path(product)
             if product_path is not None:

{muninn-7.0 → muninn-7.0.2}/muninn/tools/summary.py

@@ -34,7 +34,7 @@ def ceil(size):
     return integer_size + 1 if size > integer_size else integer_size
 
 
-def human_readable_size(size, base=1024, powers=["Bi", "Ki", "Mi", "Gi", "Ti", "Ei"]):
+def human_readable_size(size, base=1024, powers=["Bi", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]):
     if len(powers) == 0:
         return str(size)
 

{muninn-7.0 → muninn-7.0.2}/muninn/tools/sync.py

@@ -5,19 +5,20 @@
 from __future__ import absolute_import, division, print_function
 
 import argparse
-from datetime import datetime
+import datetime
 
 import muninn
 
 from muninn.tools.utils import create_parser, parse_args_and_run
 
 
-def valid_date(date: str) -> datetime:
-    date_fmt = '%Y-%m-%d'
-    try:
-        return datetime.strptime(date, date_fmt)
-    except ValueError:
-        raise argparse.ArgumentTypeError(f"invalid date: {date} (expected '{date_fmt}')")
+def valid_date(arg: str) -> datetime:
+    for format_string in ("%Y-%m-%d", "%Y-%m-%dT%H:%M:%S", "%Y-%m-%dT%H:%M:%S.%f"):
+        try:
+            return datetime.datetime.strptime(arg, format_string)
+        except ValueError:
+            pass
+    raise argparse.ArgumentTypeError(f"invalid datetime: {arg} (expected 'YYYY-MM-DD(THH:MM:SS(.ffffff))')")
 
 
 def run(args):

{muninn-7.0 → muninn-7.0.2}/muninn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: muninn
-Version: 7.0
+Version: 7.0.2
 Summary: Data product catalogue and archive system
 Home-page: https://github.com/stcorp/muninn
 Author: S[&]T
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering

{muninn-7.0 → muninn-7.0.2}/setup.py

@@ -15,7 +15,7 @@ requirements = []
 
 setup(
     name="muninn",
-    version="7.0",
+    version="7.0.2",
     description="Data product catalogue and archive system",
     url="https://github.com/stcorp/muninn",
     author="S[&]T",
@@ -54,6 +54,7 @@ setup(
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Topic :: Scientific/Engineering",

{muninn-7.0 → muninn-7.0.2}/test/test.py

@@ -1370,7 +1370,7 @@ class TestArchivePureCatalogue:  # TODO merge with TestArchive?
         assert properties.core.remote_url == 'file://' + os.path.realpath('data/a.txt').replace('\\', '/')
         assert len(archive_pure.search()) == 1
 
-        assert archive_pure.product_path(properties).startswith('file://')
+        assert archive_pure.product_path(properties).startswith('/')
 
     def test_remove(self, archive_pure):
         properties = archive_pure.ingest(