cetk 0.0.8.dev0__tar.gz → 0.1.0__tar.gz

{cetk-0.0.8.dev0 → cetk-0.1.0}/CONTRIBUTING.md

@@ -11,7 +11,7 @@
 ``` console
 $ git clone https://git.smhi.se/foclair/cetk.git
 $ cd cetk
-$ python3.11 -m venv --prompt cetk .venv
+$ python3.12 -m venv --prompt cetk .venv
 $ . .venv/bin/activate
 $ pip install -U pip setuptools wheel
 $ pip install -r requirements.txt
@@ -23,7 +23,7 @@ $ pip install -e .
 ``` console
 $ git clone https://git.smhi.se/foclair/cetk.git
 $ cd cetk
-$ python3.11 -m venv --prompt cetk .venv
+$ python3.12 -m venv --prompt cetk .venv
 $ . .venv/Scripts/activate
 $ pip install pre-commit
 $ pip install -e .

{cetk-0.0.8.dev0 → cetk-0.1.0}/PKG-INFO

@@ -1,27 +1,27 @@
 Metadata-Version: 2.4
 Name: cetk
-Version: 0.0.8.dev0
+Version: 0.1.0
 Summary: CLAIRs Emission ToolKit cetk
 Author: Christian Asker, Mattias Jakobsson, David Segersson, Eef van Dongen
 Maintainer-email: FO Luft <foluftadmin@smhi.se>
 License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: affine<3.0.1
-Requires-Dist: django<6,>=5.2.16
-Requires-Dist: fiona>=1.8.22
+Requires-Dist: django>=6.1
+Requires-Dist: fiona>=1.9.5
 Requires-Dist: geopandas>=0.12
-Requires-Dist: netCDF4>=1.6.1
-Requires-Dist: numpy<2.5,>=1.20.3
-Requires-Dist: openpyxl>=3.0.7
-Requires-Dist: pandas>=2.0
-Requires-Dist: pyogrio>=0.5.0
-Requires-Dist: rastafari2>=0.4
-Requires-Dist: rasterio>=1.3.3
-Requires-Dist: shapely>=2.0
+Requires-Dist: netCDF4>=1.6.5
+Requires-Dist: numpy<2.5,>=1.26
+Requires-Dist: openpyxl>=3.0.10
+Requires-Dist: pandas>=2.1.1
+Requires-Dist: pyogrio>=0.7.0
+Requires-Dist: rastafari>=0.4
+Requires-Dist: rasterio>=1.3.9
+Requires-Dist: shapely>=2.0.2
 Dynamic: license-file
 
 # Emission ToolKit cetk

{cetk-0.0.8.dev0 → cetk-0.1.0}/constraints-lowest.txt

@@ -13,6 +13,7 @@ attrs==26.1.0
 certifi==2026.7.22
     # via
     #   fiona
+    #   netcdf4
     #   pyogrio
     #   pyproj
     #   rasterio
@@ -32,60 +33,58 @@ cligj==0.7.2
     # via
     #   fiona
     #   rasterio
-django==5.2.16
+django==6.1
     # via cetk (pyproject.toml)
 et-xmlfile==2.0.0
     # via openpyxl
-fiona==1.8.22
+fiona==1.9.5
     # via
     #   cetk (pyproject.toml)
     #   geopandas
 geopandas==0.12.1
     # via cetk (pyproject.toml)
-munch==4.0.0
-    # via fiona
-netcdf4==1.6.1
+netcdf4==1.6.5
     # via cetk (pyproject.toml)
-numpy==1.23.2
+numpy==1.26.0
     # via
     #   cetk (pyproject.toml)
     #   cftime
     #   netcdf4
     #   pandas
     #   pyogrio
-    #   rastafari2
+    #   rastafari
     #   rasterio
     #   shapely
     #   snuggs
-openpyxl==3.0.7
+openpyxl==3.0.10
     # via cetk (pyproject.toml)
 packaging==26.3
     # via geopandas
-pandas==2.0.0
+pandas==2.1.1
     # via
     #   cetk (pyproject.toml)
     #   geopandas
-pyogrio==0.5.0
+pyogrio==0.7.0
     # via cetk (pyproject.toml)
 pyparsing==3.3.2
     # via snuggs
-pyproj==3.7.2
+pyproj==3.8.0
     # via
     #   geopandas
-    #   rastafari2
+    #   rastafari
 python-dateutil==2.9.0.post0
     # via pandas
 pytz==2026.3.post1
     # via pandas
-rastafari2==0.4.1.2
+rastafari==0.4.2.1
     # via cetk (pyproject.toml)
-rasterio==1.3.3
+rasterio==1.3.9
     # via cetk (pyproject.toml)
 setuptools==84.0.0
     # via
     #   fiona
     #   rasterio
-shapely==2.0.0
+shapely==2.0.2
     # via
     #   cetk (pyproject.toml)
     #   geopandas

{cetk-0.0.8.dev0 → cetk-0.1.0}/noxfile.py

@@ -19,7 +19,7 @@ def requirements_dev(session):
     pip_compile(session, "requirements-dev.txt", "requirements-dev.in")
 
 
-@nox.session(name="constraints-lowest", python="3.11")
+@nox.session(name="constraints-lowest", python="3.12")
 def constraints_lowest(session):
     """Re-compile the constraints for the lowest allowed dependency versions"""
     session.install("-c", "requirements-dev.txt", "uv")
@@ -58,7 +58,7 @@ def test(session):
     session.run("pytest", *session.posargs)
 
 
-@nox.session(name="test-lowest", python="3.11")
+@nox.session(name="test-lowest", python="3.12")
 def test_lowest(session):
     """Run the unit and regression tests with the lowest allowed versions."""
     session.install("-c", "requirements-dev.txt", *TEST_REQUIREMENTS)

{cetk-0.0.8.dev0 → cetk-0.1.0}/pyproject.toml

@@ -15,7 +15,7 @@ maintainers = [
 ]
 description = "CLAIRs Emission ToolKit cetk"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 classifiers = [
@@ -24,17 +24,17 @@ classifiers = [
 ]
 dependencies = [       # Release date  Comment
   "affine<3.0.1",      # 2026-08-28    required by rasterio - support for 3.0.1+ pending
-  "django >=5.2.16,<6",# 2026-07-07    due to dependabot alerts
-  "fiona >=1.8.22",    # 2022-10-17    first version with cp311 wheel
+  "django >=6.1",      # 2026-08-05    introduced support for GDAL3.13 - QGIS4.2 depends on GDAL3.13
+  "fiona >=1.9.5",     # 2023-10-12    first version with cp312 wheel
   "geopandas >=0.12",  # 2022-10-24    first version with shapely 2 support
-  "netCDF4 >=1.6.1",   # 2022-09-15    first version with cp311 wheel
-  "numpy >=1.20.3, <2.5",    # 2021-05-10    required by pandas 2.0.0, numpy 2.5 not compatible with NetCDF4
-  "openpyxl >=3.0.7",  # 2021-03-09    required by pandas 2.0.0
-  "pandas >=2.0",      # 2023-04-03    cetk import test fails with earlier versions
-  "pyogrio >=0.5.0",   # 2023-01-16    first version with cp311 wheel
-  "rastafari2 >=0.4",
-  "rasterio >=1.3.3",  # 2022-10-19    first version with cp311 wheel
-  "shapely >=2.0",     # 2022-12-12    cetk calc --rasterize fails with earlier versions
+  "netCDF4 >=1.6.5",   # 2023-10-25    first version with cp312 wheel
+  "numpy >=1.26,<2.5", # 2021-05-10    first version with cp312 wheel, numpy 2.5 not compatible with NetCDF4
+  "openpyxl >=3.0.10", # 2021-03-09    required by pandas
+  "pandas >=2.1.1",    # 2023-09-20    first version with cp312 wheel
+  "pyogrio >=0.7.0",   # 2023-10-25    first version with cp312 wheel
+  "rastafari >=0.4",
+  "rasterio >=1.3.9",  # 2023-10-19    first version with cp312 wheel
+  "shapely >=2.0.2",   # 2023-10-12    first version with cp312 wheel
 ]
 dynamic = ["version"]
 
@@ -58,7 +58,6 @@ filterwarnings = [
     "error",
     "ignore:numpy\\.ndarray size changed:RuntimeWarning",
     "ignore:CheckConstraint\\.check is deprecated:DeprecationWarning",
-    "ignore:coord_dim setter is deprecated:DeprecationWarning",
 ]
 
 [tool.ruff.lint]

{cetk-0.0.8.dev0 → cetk-0.1.0}/src/cetk/__init__.py

@@ -1,6 +1,6 @@
 """cetk, a python library for editing Clair emission inventories offline."""
 
-__version__ = "0.0.8.dev0"
+__version__ = "0.1.0"
 
 import os
 

{cetk-0.0.8.dev0 → cetk-0.1.0}/src/cetk/edb/importers/roadsource_import.py

@@ -1377,7 +1377,11 @@ def import_roads(
             raise ValidationError(msg)
 
         gdalgeom = GDALLineString(source_geom.wkt)
-        gdalgeom.coord_dim = 2
+        if gdalgeom.coord_dim == 3:
+            xy_coords = [point[:2] for point in gdalgeom.tuple]
+            wkt_string = f"LINESTRING ({', '.join(f'{x} {y}' for x, y in xy_coords)})"
+            gdalgeom = GDALLineString(wkt_string)
+
         gdalgeom.transform(trans)
         geom = gdalgeom.geos
         road_data = {"geom": geom}

{cetk-0.0.8.dev0 → cetk-0.1.0}/src/cetk/settings.py

@@ -5,13 +5,21 @@ import os
 DEBUG = os.environ.get("CETK_DEBUG", False)
 
 if "FLATPAK_ID" in os.environ:
-    SPATIALITE_LIBRARY_PATH = "/app/lib/mod_spatialite.so"
+    SPATIALITE_LIBRARY_PATH = os.environ.get(
+        "SPATIALITE_LIBRARY_PATH", "/app/lib/mod_spatialite.so"
+    )
 elif os.name == "posix":
-    SPATIALITE_LIBRARY_PATH = "/usr/lib64/mod_spatialite.so"
+    SPATIALITE_LIBRARY_PATH = os.environ.get(
+        "SPATIALITE_LIBRARY_PATH", "/usr/lib64/mod_spatialite.so"
+    )
 elif os.name == "nt":
-    SPATIALITE_LIBRARY_PATH = r"C:\OSGeo4W\bin\mod_spatialite.dll"
+    SPATIALITE_LIBRARY_PATH = os.environ.get(
+        "SPATIALITE_LIBRARY_PATH", r"C:\OSGeo4W\bin\mod_spatialite.dll"
+    )
 else:
-    SPATIALITE_LIBRARY_PATH = "/usr/lib64/mod_spatialite.so"
+    SPATIALITE_LIBRARY_PATH = os.environ.get(
+        "SPATIALITE_LIBRARY_PATH", "/usr/lib64/mod_spatialite.so"
+    )
 
 # Application definition
 INSTALLED_APPS = [

{cetk-0.0.8.dev0 → cetk-0.1.0}/src/cetk.egg-info/PKG-INFO

@@ -1,27 +1,27 @@
 Metadata-Version: 2.4
 Name: cetk
-Version: 0.0.8.dev0
+Version: 0.1.0
 Summary: CLAIRs Emission ToolKit cetk
 Author: Christian Asker, Mattias Jakobsson, David Segersson, Eef van Dongen
 Maintainer-email: FO Luft <foluftadmin@smhi.se>
 License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: affine<3.0.1
-Requires-Dist: django<6,>=5.2.16
-Requires-Dist: fiona>=1.8.22
+Requires-Dist: django>=6.1
+Requires-Dist: fiona>=1.9.5
 Requires-Dist: geopandas>=0.12
-Requires-Dist: netCDF4>=1.6.1
-Requires-Dist: numpy<2.5,>=1.20.3
-Requires-Dist: openpyxl>=3.0.7
-Requires-Dist: pandas>=2.0
-Requires-Dist: pyogrio>=0.5.0
-Requires-Dist: rastafari2>=0.4
-Requires-Dist: rasterio>=1.3.3
-Requires-Dist: shapely>=2.0
+Requires-Dist: netCDF4>=1.6.5
+Requires-Dist: numpy<2.5,>=1.26
+Requires-Dist: openpyxl>=3.0.10
+Requires-Dist: pandas>=2.1.1
+Requires-Dist: pyogrio>=0.7.0
+Requires-Dist: rastafari>=0.4
+Requires-Dist: rasterio>=1.3.9
+Requires-Dist: shapely>=2.0.2
 Dynamic: license-file
 
 # Emission ToolKit cetk

cetk-0.1.0/src/cetk.egg-info/requires.txt

@@ -0,0 +1,12 @@
+affine<3.0.1
+django>=6.1
+fiona>=1.9.5
+geopandas>=0.12
+netCDF4>=1.6.5
+numpy<2.5,>=1.26
+openpyxl>=3.0.10
+pandas>=2.1.1
+pyogrio>=0.7.0
+rastafari>=0.4
+rasterio>=1.3.9
+shapely>=2.0.2

cetk-0.0.8.dev0/src/cetk.egg-info/requires.txt

@@ -1,12 +0,0 @@
-affine<3.0.1
-django<6,>=5.2.16
-fiona>=1.8.22
-geopandas>=0.12
-netCDF4>=1.6.1
-numpy<2.5,>=1.20.3
-openpyxl>=3.0.7
-pandas>=2.0
-pyogrio>=0.5.0
-rastafari2>=0.4
-rasterio>=1.3.3
-shapely>=2.0