PyTracerLab 0.2.2__tar.gz → 0.2.4__tar.gz

{pytracerlab-0.2.2 → pytracerlab-0.2.4}/.github/workflows/ci.yml

@@ -11,12 +11,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
       - name: Install deps (pkg + dev tools)
         run: |
           python -m pip install -U pip
           pip install -e .[dev]
       - name: Run pre-commit
-        run: pre-commit run --all-files
+        run: pre-commit run --all-files --show-diff-on-failure
       - name: Run tests
         run: pytest -q

{pytracerlab-0.2.2 → pytracerlab-0.2.4}/.github/workflows/docs.yml

@@ -2,12 +2,20 @@ name: Docs
 on:
   push:
     branches: [ main ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
 
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -15,6 +23,9 @@ jobs:
         with:
           python-version: "3.11"
 
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
       - name: Install doc deps
         run: |
           python -m pip install -U pip
@@ -31,8 +42,18 @@ jobs:
         run: |
           sphinx-build -b html -W -E docs docs/_build/html
 
-      - name: Publish to gh-pages
-        uses: peaceiris/actions-gh-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: docs/_build/html
+          path: docs/_build/html
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

pytracerlab-0.2.4/.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 25.11.0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.5
+    hooks:
+      - id: ruff
+        args: [--fix]
+        types: [python]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace

{pytracerlab-0.2.2 → pytracerlab-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyTracerLab
-Version: 0.2.2
+Version: 0.2.4
 Summary: Lumped parameter groundwater age simulations with a simple user interface - in Python
 Author: Max G. Rudolph
 License: MIT

{pytracerlab-0.2.2 → pytracerlab-0.2.4}/docs/conf.py

@@ -31,6 +31,13 @@ autodoc_mock_imports = ["PyQt5", "numpy", "scipy", "matplotlib"]
 
 autosummary_generate = True
 autodoc_default_options = {"members": True, "undoc-members": False, "show-inheritance": False}
+# Use fully qualified paths for type-hint cross references to avoid
+# ambiguous short names like "Model" and "Unit".
+autodoc_typehints_format = "fully-qualified"
+autodoc_type_aliases = {
+    "Model": "PyTracerLab.model.model.Model",
+    "Unit": "PyTracerLab.model.units.Unit",
+}
 
 napoleon_google_docstring = False  # True if using Google style
 napoleon_numpy_docstring = True  # True if using NumPy style
@@ -83,6 +90,25 @@ autosummary_imported_members = False
 # Disambiguate short type names in NumPy-style docstrings
 napoleon_type_aliases = {
     "Unit": "PyTracerLab.model.units.Unit",
-    "Model": "PyTracerLab.model.Model",  # prefer public alias to avoid ambiguity
+    "Model": "PyTracerLab.model.model.Model",
     "Solver": "PyTracerLab.model.solver.Solver",
 }
+
+# Skip package-level re-exports in ``PyTracerLab.model`` to avoid duplicate
+# Python domain targets (e.g., both ``PyTracerLab.model.Model`` and
+# ``PyTracerLab.model.model.Model``).
+_MODEL_PACKAGE_REEXPORTS = {"Model", "Unit", "EPMUnit", "EMUnit", "PMUnit", "DMUnit"}
+
+
+def _skip_model_reexports(app, what, name, obj, skip, options):
+    env = getattr(app, "env", None)
+    temp_data = getattr(env, "temp_data", {}) if env is not None else {}
+    current_module = temp_data.get("autodoc:module")
+    if what == "module" and current_module == "PyTracerLab.model":
+        if name in _MODEL_PACKAGE_REEXPORTS:
+            return True
+    return None
+
+
+def setup(app):
+    app.connect("autodoc-skip-member", _skip_model_reexports)