cetk 0.0.4.dev0__tar.gz → 0.0.6.dev0__tar.gz

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/.pre-commit-config.yaml

@@ -1,18 +1,16 @@
 repos:
-  - repo: https://github.com/ambv/black
-    rev: "22.8.0"
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: "1.25.0"
     hooks:
-      - id: black
-  - repo: https://github.com/pycqa/isort
-    rev: "5.12.0"
+      - id: django-upgrade
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.11
     hooks:
-      - id: isort
-  - repo: https://github.com/pycqa/flake8
-    rev: "5.0.4"
-    hooks:
-      - id: flake8
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v4.3.0"
+    rev: "v5.0.0"
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=600", "--enforce-all"]

cetk-0.0.6.dev0/MANIFEST.in

@@ -0,0 +1,3 @@
+prune   .github
+exclude .gitignore
+exclude .gitlab-ci.yml

cetk-0.0.6.dev0/PKG-INFO

@@ -0,0 +1,93 @@
+Metadata-Version: 2.4
+Name: cetk
+Version: 0.0.6.dev0
+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.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django<6,>=4.2
+Requires-Dist: fiona>=1.8.18
+Requires-Dist: geopandas>=0.12
+Requires-Dist: netCDF4>=1.5.4
+Requires-Dist: numpy>=1.20.3
+Requires-Dist: openpyxl>=3.0.7
+Requires-Dist: pandas>=2.0
+Requires-Dist: pyogrio>=0.4.2
+Requires-Dist: rastafari>=0.4
+Requires-Dist: rasterio>=1.3
+Requires-Dist: shapely>=2.0
+Dynamic: license-file
+
+# Emission ToolKit cetk
+
+Emission toolkit for command line to import, validate, edit and analyse emissions.
+Used in QGIS Plugin Eclair. This package is maintained by [Eef van Dongen][] at SMHI.
+
+[Eef van Dongen]: mailto:eef.vandongen@smhi.se
+
+## Installation
+```
+python3 -m venv --prompt cetk .venv
+. .venv/bin/activate
+python -m pip install -e .
+```
+Check that installation was successful and receive information on how to use the toolkit:
+```
+cetk -h
+```
+
+Before using the toolkit, initialize the template database by:
+```
+cetkmanage migrate
+```
+
+If you did not change the default path, this should create
+`~/.config/eclair/eclair.gpkg`
+
+New databases can now be created by copying the template database. This is easiest done using the cetk command:
+```
+cetk create /home/myuser/mydatabase.gpkg
+```
+
+To use a specific database, set environment variable "CETK_DATABASE_PATH".
+```
+export CETK_DATABASE_PATH="/home/myuser/mydatabase.gpkg"
+```
+
+For more verbose logging, set environment variable CETK_DEBUG=1:
+```
+export CETK_DEBUG=1
+```
+
+## Contributing
+
+### Environment
+Install pre-commit hooks:
+
+```
+. .venv/bin/activate
+pip install -r requirements-dev.txt
+pre-commit install
+```
+
+### Testing
+
+Run tests with
+```
+nox
+```
+
+### Update requirements
+
+If any new development requirements are added to
+[requirements-dev.in](requirements-dev.in), update
+[requirements-dev.txt](requirements-dev.txt) by running
+
+```
+nox -s requirements
+```

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/README.md

@@ -9,7 +9,6 @@ Used in QGIS Plugin Eclair. This package is maintained by [Eef van Dongen][] at
 ```
 python3 -m venv --prompt cetk .venv
 . .venv/bin/activate
-python -m pip install -r ./requirements.txt
 python -m pip install -e .
 ```
 Check that installation was successful and receive information on how to use the toolkit:
@@ -53,17 +52,17 @@ pre-commit install
 
 ### Testing
 
-Run tests by
+Run tests with
 ```
-pytest
+nox
 ```
+
 ### Update requirements
 
-Install pip-tools:
-```
-pip install pip-tools
-```
-Update requirements.txt and requirements-dev.txt by:
+If any new development requirements are added to
+[requirements-dev.in](requirements-dev.in), update
+[requirements-dev.txt](requirements-dev.txt) by running
+
 ```
-./compilereqs
+nox -s requirements
 ```

cetk-0.0.6.dev0/constraints-lowest.txt

@@ -0,0 +1,99 @@
+# This file was autogenerated by uv via the following command:
+#    nox -s constraints-lowest
+affine==2.4.0
+    # via rasterio
+asgiref==3.8.1
+    # via django
+attrs==25.3.0
+    # via
+    #   fiona
+    #   rasterio
+certifi==2025.4.26
+    # via
+    #   fiona
+    #   pyogrio
+    #   pyproj
+    #   rasterio
+cftime==1.6.4.post1
+    # via netcdf4
+click==7.1.2
+    # via
+    #   click-plugins
+    #   cligj
+    #   fiona
+    #   rasterio
+click-plugins==1.1.1
+    # via
+    #   fiona
+    #   rasterio
+cligj==0.7.2
+    # via
+    #   fiona
+    #   rasterio
+django==4.2
+    # via cetk (pyproject.toml)
+et-xmlfile==2.0.0
+    # via openpyxl
+fiona==1.8.18
+    # via
+    #   cetk (pyproject.toml)
+    #   geopandas
+geopandas==0.12.1
+    # via cetk (pyproject.toml)
+munch==4.0.0
+    # via fiona
+netcdf4==1.5.4
+    # via cetk (pyproject.toml)
+numpy==1.20.3
+    # via
+    #   cetk (pyproject.toml)
+    #   cftime
+    #   netcdf4
+    #   pandas
+    #   pyogrio
+    #   rastafari
+    #   rasterio
+    #   shapely
+    #   snuggs
+openpyxl==3.0.7
+    # via cetk (pyproject.toml)
+packaging==25.0
+    # via geopandas
+pandas==2.0.0
+    # via
+    #   cetk (pyproject.toml)
+    #   geopandas
+pyogrio==0.4.2
+    # via cetk (pyproject.toml)
+pyparsing==3.2.3
+    # via snuggs
+pyproj==3.6.1
+    # via
+    #   geopandas
+    #   rastafari
+python-dateutil==2.9.0.post0
+    # via pandas
+pytz==2025.2
+    # via pandas
+rastafari==0.4.0
+    # via cetk (pyproject.toml)
+rasterio==1.3.0
+    # via cetk (pyproject.toml)
+setuptools==80.9.0
+    # via rasterio
+shapely==2.0.0
+    # via
+    #   cetk (pyproject.toml)
+    #   geopandas
+six==1.17.0
+    # via
+    #   fiona
+    #   python-dateutil
+snuggs==1.4.7
+    # via rasterio
+sqlparse==0.5.3
+    # via django
+typing-extensions==4.14.0
+    # via asgiref
+tzdata==2025.2
+    # via pandas

cetk-0.0.6.dev0/flatpak_install.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+FLATPAK="org.qgis.qgis"
+
+if [ ! $(flatpak run --command=python $FLATPAK -m pip --version | cut -d " " -f1) = "pip" ]; then
+   echo "downloading get-pip.py"
+   flatpak run --command=wget $FLATPAK https://bootstrap.pypa.io/get-pip.py
+   echo "installing pip"
+   flatpak run --command=python $FLATPAK get-pip.py --user
+else
+   echo "found pip"
+fi
+flatpak run --command=python $FLATPAK -m pip install -r ./requirements-dev.txt
+flatpak run --command=python $FLATPAK -m pip install -e .
+flatpak override --env=PATH="/app/bin:/usr/bin:/var/data/python/bin" $FLATPAK --user
+version=$(flatpak run --command=cetk $FLATPAK --version | cut -d " " -f2)
+echo "successfully installed pip and cetk ${version} into flatpak"

cetk-0.0.6.dev0/noxfile.py

@@ -0,0 +1,97 @@
+"""Nox configuration for cetk."""
+
+import os
+from pathlib import Path
+
+import nox
+
+nox.needs_version = ">=2024.03.02"
+nox.options.default_venv_backend = "uv|virtualenv"
+nox.options.sessions = ["django", "migrations", "test", "test-lowest"]
+
+TEST_REQUIREMENTS = ["pytest", "pytest-cov", "pytest-django"]
+
+
+@nox.session(name="requirements-dev")
+def requirements_dev(session):
+    """Re-compile the development requirements"""
+    session.install("-c", "requirements-dev.txt", "uv")
+    pip_compile(session, "requirements-dev.txt", "requirements-dev.in")
+
+
+@nox.session(name="constraints-lowest", python="3.9")
+def constraints_lowest(session):
+    """Re-compile the constraints for the lowest allowed dependency versions"""
+    session.install("-c", "requirements-dev.txt", "uv")
+    session.run("rm", "-f", "constraints-lowest.txt", external=True)
+    pip_compile(
+        session,
+        "constraints-lowest.txt",
+        "pyproject.toml",
+        "--resolution",
+        "lowest-direct",
+    )
+
+
+@nox.session
+def django(session):
+    """Run Django's system checks"""
+    install_cetk(session)
+    session.run(
+        "python", "manage.py", "check", "--fail-level=WARNING", *session.posargs
+    )
+
+
+@nox.session
+def migrations(session):
+    """Check that the database migrations are up-to-date"""
+    install_cetk(session)
+    args = session.posargs or ["--check"]
+    session.run("python", "manage.py", "makemigrations", "--skip-checks", *args)
+
+
+@nox.session
+def test(session):
+    """Run the unit and regression tests"""
+    session.install("-c", "requirements-dev.txt", *TEST_REQUIREMENTS)
+    install_cetk(session)
+    session.run("pytest", *session.posargs)
+
+
+@nox.session(name="test-lowest", python="3.9")
+def test_lowest(session):
+    """Run the unit and regression tests with the lowest allowed versions."""
+    session.install("-c", "requirements-dev.txt", *TEST_REQUIREMENTS)
+    install_cetk(session, lowest_versions=True)
+    session.run(
+        "pytest",
+        "-Wdefault",
+        "-Wignore::DeprecationWarning",
+        "-Wignore::FutureWarning",
+        "-Wignore::PendingDeprecationWarning",
+        "-Wignore:numpy.ndarray size changed:RuntimeWarning",
+        *session.posargs,
+    )
+
+
+def install_cetk(session, *, lowest_versions=False, use_wheel_in_ci=True):
+    constraints = ("-c", "constraints-lowest.txt") if lowest_versions else ()
+    if use_wheel_in_ci and "CI" in os.environ:
+        # in CI we install cetk from the built wheel
+        wheel = next(Path("./dist").glob("*.whl"))
+        session.install(*constraints, wheel)
+    else:
+        # otherwise cetk is installed in editable mode to allow `nox -R`
+        session.install(*constraints, "-e", ".")
+
+
+def pip_compile(session, outputfile, *extra_args):
+    # fmt: off
+    session.run(
+        "uv", "pip", "compile",
+        "--quiet",
+        "--output-file", outputfile,
+        "--custom-compile-command", f"nox -s {session.name}",
+        *session.posargs, *extra_args,
+    )
+    # fmt: on

cetk-0.0.6.dev0/pyproject.toml

@@ -0,0 +1,67 @@
+[build-system]
+requires = ["setuptools >= 77.0.3", "setuptools-scm >= 8"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "cetk"
+authors = [
+  { name = "Christian Asker" },
+  { name = "Mattias Jakobsson" },
+  { name = "David Segersson" },
+  { name = "Eef van Dongen" },
+]
+maintainers = [
+  { name = "FO Luft", email = "foluftadmin@smhi.se" },
+]
+description = "CLAIRs Emission ToolKit cetk"
+readme = "README.md"
+requires-python = ">=3.9"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Topic :: Scientific/Engineering :: Atmospheric Science",
+]
+dependencies = [       # Release date  Comment
+  "django >=4.2,<6",   # 2023-04-03    current LTS
+  "fiona >=1.8.18",    # 2020-11-17    first version with cp39 wheel
+  "geopandas >=0.12",  # 2022-10-24    first version with shapely 2 support
+  "netCDF4 >=1.5.4",   # 2020-07-23    first version with cp39 wheel
+  "numpy >=1.20.3",    # 2021-05-10    required by pandas 2.0.0
+  "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.4.2",   # 2022-10-06    cetk export test fails with earlier versions
+  "rastafari >=0.4",
+  "rasterio >=1.3",    # 2022-07-06    rasterio.CRS is missing in earlier versions
+  "shapely >=2.0",     # 2022-12-12    cetk calc --rasterize fails with earlier versions
+]
+dynamic = ["version"]
+
+[project.scripts]
+cetk = "cetk.tools.cetk_command:main"
+cetkmanage = "cetk.tools.manage:main"
+
+[tool.coverage.run]
+source = ["cetk"]
+branch = true
+omit = [
+]
+
+[tool.mypy]
+ignore_missing_imports = true
+
+[tool.pytest.ini_options]
+pythonpath = "tests"
+DJANGO_SETTINGS_MODULE = "cetk.settings"
+filterwarnings = [
+    "error",
+    "ignore:numpy\\.ndarray size changed:RuntimeWarning",
+    "ignore:CheckConstraint\\.check is deprecated:DeprecationWarning",
+    "ignore:coord_dim setter is deprecated:DeprecationWarning",
+]
+
+[tool.ruff.lint]
+extend-select = ["I", "RUF100"]
+
+[tool.setuptools.dynamic]
+version = { attr = "cetk.__version__" }

cetk-0.0.6.dev0/requirements-dev.in

@@ -0,0 +1,13 @@
+# CI/CD and development requirements for the Gadget
+build
+coverage[toml]
+django >=4.2,<6
+nox
+pip-tools
+pre-commit
+pytest
+pytest-cov
+pytest-django
+ruff
+setuptools-scm
+uv

cetk-0.0.6.dev0/requirements-dev.txt

@@ -0,0 +1,87 @@
+# This file was autogenerated by uv via the following command:
+#    nox -s requirements-dev
+argcomplete==3.6.2
+    # via nox
+asgiref==3.8.1
+    # via django
+attrs==25.3.0
+    # via nox
+build==0.10.0
+    # via
+    #   -r requirements-dev.in
+    #   pip-tools
+cfgv==3.4.0
+    # via pre-commit
+click==8.1.7
+    # via pip-tools
+colorlog==6.9.0
+    # via nox
+coverage==7.3.0
+    # via
+    #   -r requirements-dev.in
+    #   pytest-cov
+dependency-groups==1.3.1
+    # via nox
+distlib==0.3.7
+    # via virtualenv
+django==5.2.1
+    # via -r requirements-dev.in
+filelock==3.12.3
+    # via virtualenv
+identify==2.5.27
+    # via pre-commit
+iniconfig==2.0.0
+    # via pytest
+nodeenv==1.8.0
+    # via pre-commit
+nox==2025.5.1
+    # via -r requirements-dev.in
+packaging==24.1
+    # via
+    #   build
+    #   dependency-groups
+    #   nox
+    #   pytest
+    #   setuptools-scm
+pip==23.2.1
+    # via pip-tools
+pip-tools==7.3.0
+    # via -r requirements-dev.in
+platformdirs==3.10.0
+    # via virtualenv
+pluggy==1.3.0
+    # via pytest
+pre-commit==3.3.3
+    # via -r requirements-dev.in
+pyproject-hooks==1.0.0
+    # via build
+pytest==7.4.0
+    # via
+    #   -r requirements-dev.in
+    #   pytest-cov
+    #   pytest-django
+pytest-cov==4.1.0
+    # via -r requirements-dev.in
+pytest-django==4.5.2
+    # via -r requirements-dev.in
+pyyaml==6.0.1
+    # via pre-commit
+ruff==0.11.11
+    # via -r requirements-dev.in
+setuptools==69.1.1
+    # via
+    #   nodeenv
+    #   pip-tools
+    #   setuptools-scm
+setuptools-scm==8.3.1
+    # via -r requirements-dev.in
+sqlparse==0.4.3
+    # via django
+uv==0.7.9
+    # via -r requirements-dev.in
+virtualenv==20.24.3
+    # via
+    #   nox
+    #   pre-commit
+wheel==0.41.2
+    # via pip-tools

cetk-0.0.6.dev0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/src/cetk/__init__.py

@@ -1,6 +1,6 @@
 """cetk, a python library for editing Clair emission inventories offline."""
 
-__version__ = "0.0.4.dev"
+__version__ = "0.0.6.dev"
 
 import os
 
@@ -16,6 +16,7 @@ DEFAULT_SETTINGS = {
     "TIME_ZONE": "UTC",
     "USE_I18N": True,
     "USE_TZ": True,
+    "MAX_ERROR_MESSAGES": 10,
 }
 
 log = logging.getLogger(__name__)
@@ -67,10 +68,10 @@ def configure():
                 "version": 1,
                 "disable_existing_loggers": False,
                 "formatters": {
-                    "cetk": {"format": "%(levelname)s: %(message)s"},  # noqa
+                    "cetk": {"format": "%(levelname)s: %(message)s"},
                     "cetk_debug": {
                         "format": "%(asctime)s %(levelname)s: %(name)s  %(message)s"
-                    },  # noqa
+                    },
                 },
                 "handlers": {
                     "console": {"class": "logging.StreamHandler", "formatter": "cetk"},
@@ -80,7 +81,7 @@ def configure():
                     },
                 },
                 "loggers": {"cetk": cetk_logger},
-            }
+            },
         )
         django.setup()
         log.debug("configured django")

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/src/cetk/db.py

@@ -23,7 +23,7 @@ def run_migrate(db_path=None):
                     "cetkmanage",
                     "shell",
                     "-c",
-                    "import django;django.db.connection.cursor().execute('SELECT InitSpatialMetaData(1);')",  # noqa: E501
+                    "import django;django.db.connection.cursor().execute('SELECT InitSpatialMetaData(1);')",
                 ],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/src/cetk/edb/cache.py

@@ -38,7 +38,6 @@ class NotInCacheError(Exception):
 
 
 class EmissionCache:
-
     """An emission out-of-memory cache."""
 
     def __init__(self, querysets):

{cetk-0.0.4.dev0 → cetk-0.0.6.dev0}/src/cetk/edb/exporters.py

@@ -534,9 +534,9 @@ def create_source_sheet(
             for act in source.activities.all():
                 activity_unit = Activity.objects.get(id=act.activity_id).unit
                 activity_rate = activity_rate_unit_from_si(act.rate, activity_unit)
-                source_activity_rates[
-                    Activity.objects.get(id=act.activity_id).name
-                ] = activity_rate
+                source_activity_rates[Activity.objects.get(id=act.activity_id).name] = (
+                    activity_rate
+                )
             act_row = [
                 source_activity_rates[name] if name in source_activities else 0
                 for name in activity_names