geometamaker 0.1.0__tar.gz → 0.1.2__tar.gz

{geometamaker-0.1.0 → geometamaker-0.1.2}/.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

geometamaker-0.1.2/HISTORY.rst

@@ -0,0 +1,23 @@
+Release History
+===============
+
+.. Unreleased Changes
+
+0.1.2 (2025-02-05)
+------------------
+* Declared dependencies in ``pyproject.toml`` to facilitate pip installs.
+
+0.1.1 (2025-02-04)
+------------------
+* Fixed a bug where rasters without a defined nodata value could not be
+  described. https://github.com/natcap/geometamaker/issues/70
+* All YAML documents will be written as UTF-8 encoded files.
+  https://github.com/natcap/geometamaker/issues/71
+* Fixed a bug in formatting of validation messages about nested attributes
+  https://github.com/natcap/geometamaker/issues/65
+* Added exception handling to make validating directories more resilient to
+  unreadable yaml files. https://github.com/natcap/geometamaker/issues/62
+
+0.1.0 (2025-01-10)
+------------------
+* First release!

{geometamaker-0.1.0 → geometamaker-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geometamaker
-Version: 0.1.0
+Version: 0.1.2
 Summary: metadata creation for geospatial data
 Maintainer: Natural Capital Project Software Team
 License: 
@@ -219,11 +219,23 @@ Classifier: Programming Language :: Python :: 3.9
 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: License :: OSI Approved :: Apache Software License
 Classifier: Topic :: Scientific/Engineering :: GIS
-Requires-Python: <3.13,>=3.9
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: aiohttp
+Requires-Dist: click
+Requires-Dist: fsspec
+Requires-Dist: GDAL
+Requires-Dist: frictionless>=5.10.0
+Requires-Dist: numpy
+Requires-Dist: platformdirs
+Requires-Dist: Pydantic>=2.0
+Requires-Dist: pygeoprocessing>=2.4.5
+Requires-Dist: pyyaml
+Requires-Dist: requests
 
 A Python library for creating human and machine-readable metadata for geospatial data.
 

{geometamaker-0.1.0 → geometamaker-0.1.2}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "geometamaker"
 description = "metadata creation for geospatial data"
 readme = "README.md"
-requires-python = ">=3.9,<3.13"
+requires-python = ">=3.9"
 license = {file = "LICENSE.txt"}
 maintainers = [
     {name = "Natural Capital Project Software Team"}
@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: Apache Software License",
     "Topic :: Scientific/Engineering :: GIS"
 ]
@@ -29,6 +30,9 @@ classifiers = [
 # using the corresponding setup args `install_requires` and `extras_require`
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+
 [tool.setuptools_scm]
 version_scheme = "post-release"
 local_scheme = "node-and-date"

{geometamaker-0.1.0 → geometamaker-0.1.2}/requirements.txt

@@ -6,10 +6,10 @@ aiohttp
 click
 fsspec
 GDAL
-frictionless
+frictionless>=5.10.0
 numpy
 platformdirs
-Pydantic
+Pydantic>=2.0
 pygeoprocessing>=2.4.5
 pyyaml
 requests

{geometamaker-0.1.0 → geometamaker-0.1.2}/src/geometamaker/cli.py

@@ -48,7 +48,7 @@ def echo_validation_error(error, filepath):
     summary = u'\u2715' + f' {filepath}: {error.error_count()} validation errors'
     click.secho(summary, fg='bright_red')
     for e in error.errors():
-        location = ', '.join(e['loc'])
+        location = '.'.join([str(loc) for loc in e['loc']])
         msg_string = (f"    {e['msg']}. [input_value={e['input']}, "
                       f"input_type={type(e['input']).__name__}]")
         click.secho(location, bold=True)

{geometamaker-0.1.0 → geometamaker-0.1.2}/src/geometamaker/geometamaker.py

@@ -471,15 +471,17 @@ def validate_dir(directory, recursive=False):
     for filepath in file_list:
         if filepath.endswith('.yml'):
             yaml_files.append(filepath)
+            msg = ''
             try:
                 error = validate(filepath)
                 if error:
-                    messages.append(error)
-                else:
-                    messages.append('')
+                    msg = error
             except ValueError:
-                messages.append(
-                    'does not appear to be a geometamaker document')
+                msg = 'does not appear to be a geometamaker document'
+            except yaml.YAMLError as exc:
+                LOGGER.debug(exc)
+                msg = 'is not a readable yaml document'
+            messages.append(msg)
 
     return (yaml_files, messages)
 

{geometamaker-0.1.0 → geometamaker-0.1.2}/src/geometamaker/models.py

@@ -91,7 +91,7 @@ class BandSchema(Parent):
     index: int
     gdal_type: str
     numpy_type: str
-    nodata: Union[int, float]
+    nodata: Union[int, float, None]
     description: str = ''
     title: str = ''
     units: str = ''
@@ -242,7 +242,7 @@ class Profile(BaseMetadata):
             target_path (str): path to a yaml file to be written
 
         """
-        with open(target_path, 'w') as file:
+        with open(target_path, 'w', encoding='utf-8') as file:
             file.write(utils.yaml_dump(self.model_dump()))
 
 
@@ -523,7 +523,7 @@ class Resource(BaseMetadata):
             target_path = os.path.join(
                 workspace, os.path.basename(self.metadata_path))
 
-        with open(target_path, 'w') as file:
+        with open(target_path, 'w', encoding='utf-8') as file:
             file.write(utils.yaml_dump(
                 self.model_dump(exclude=['metadata_path'])))
 

{geometamaker-0.1.0 → geometamaker-0.1.2}/src/geometamaker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: geometamaker
-Version: 0.1.0
+Version: 0.1.2
 Summary: metadata creation for geospatial data
 Maintainer: Natural Capital Project Software Team
 License: 
@@ -219,11 +219,23 @@ Classifier: Programming Language :: Python :: 3.9
 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: License :: OSI Approved :: Apache Software License
 Classifier: Topic :: Scientific/Engineering :: GIS
-Requires-Python: <3.13,>=3.9
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: aiohttp
+Requires-Dist: click
+Requires-Dist: fsspec
+Requires-Dist: GDAL
+Requires-Dist: frictionless>=5.10.0
+Requires-Dist: numpy
+Requires-Dist: platformdirs
+Requires-Dist: Pydantic>=2.0
+Requires-Dist: pygeoprocessing>=2.4.5
+Requires-Dist: pyyaml
+Requires-Dist: requests
 
 A Python library for creating human and machine-readable metadata for geospatial data.
 

{geometamaker-0.1.0 → geometamaker-0.1.2}/src/geometamaker.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ src/geometamaker.egg-info/PKG-INFO
 src/geometamaker.egg-info/SOURCES.txt
 src/geometamaker.egg-info/dependency_links.txt
 src/geometamaker.egg-info/entry_points.txt
+src/geometamaker.egg-info/requires.txt
 src/geometamaker.egg-info/top_level.txt
 tests/test_geometamaker.py
 tests/data/template.yml

geometamaker-0.1.2/src/geometamaker.egg-info/requires.txt

@@ -0,0 +1,11 @@
+aiohttp
+click
+fsspec
+GDAL
+frictionless>=5.10.0
+numpy
+platformdirs
+Pydantic>=2.0
+pygeoprocessing>=2.4.5
+pyyaml
+requests

{geometamaker-0.1.0 → geometamaker-0.1.2}/tests/test_geometamaker.py

@@ -57,7 +57,7 @@ def create_vector(target_filepath, field_map=None, driver='GEOJSON'):
 def create_raster(
         numpy_dtype, target_path,
         pixel_size=(1, 1), projection_epsg=4326,
-        origin=(0, 0), n_bands=2):
+        origin=(0, 0), n_bands=2, define_nodata=True):
     driver_name, creation_options = DEFAULT_GTIFF_CREATION_TUPLE_OPTIONS
     raster_driver = gdal.GetDriverByName(driver_name)
     ny, nx = (2, 2)
@@ -76,11 +76,13 @@ def create_raster(
         raster.SetProjection(projection_wkt)
 
     base_array = numpy.full((2, 2), 1, dtype=numpy_dtype)
+
     target_nodata = pygeoprocessing.choose_nodata(numpy_dtype)
 
     for i in range(n_bands):
         band = raster.GetRasterBand(i + 1)
-        band.SetNoDataValue(target_nodata)
+        if define_nodata:
+            band.SetNoDataValue(target_nodata)
         band.WriteArray(base_array)
     band = None
     raster = None
@@ -274,6 +276,17 @@ class GeometamakerTests(unittest.TestCase):
         resource = geometamaker.describe(datasource_path)
         self.assertEqual(resource.spatial.crs, 'unknown')
 
+    def test_describe_raster_no_nodata(self):
+        """Test for a raster that has no nodata value."""
+        import geometamaker
+
+        datasource_path = os.path.join(self.workspace_dir, 'raster.tif')
+        create_raster(numpy.int16, datasource_path,
+                      projection_epsg=None, define_nodata=False)
+
+        resource = geometamaker.describe(datasource_path)
+        self.assertIsNone(resource.data_model.bands[0].nodata)
+
     def test_describe_zip(self):
         """Test metadata for a zipfile includes list of contents."""
         import zipfile
@@ -663,6 +676,22 @@ class GeometamakerTests(unittest.TestCase):
             self.workspace_dir, recursive=True)
         self.assertEqual(len(yaml_files), 2)
 
+    def test_validate_dir_handles_exception(self):
+        """Test validate_dir function handles yaml exceptions."""
+        import geometamaker
+
+        yaml_path = os.path.join(self.workspace_dir, 'foo.yml')
+        with open(yaml_path, 'w') as file:
+            # An example from a yaml file containing some jinja templating.
+            # This should raise a yaml.scanner.ScannerError:
+            # while scanning for the next token
+            # found character '%' that cannot start any token
+            file.write('{% set name = "simplejson" %}')
+
+        yaml_files, msgs = geometamaker.validate_dir(self.workspace_dir)
+        self.assertEqual(len(yaml_files), 1)
+        self.assertEqual(msgs[0], 'is not a readable yaml document')
+
     def test_describe_dir_with_shapefile(self):
         """Test describe directory containing a multi-file dataset."""
         import geometamaker

geometamaker-0.1.0/HISTORY.rst

@@ -1,8 +0,0 @@
-Release History
-===============
-
-.. Unreleased Changes
-
-0.1.0 (2025-01-10)
-------------------
-* First release!