Release 3.2.1

.github/workflows/flake8.yaml

@@ -6,20 +6,23 @@ name: flake8
 # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#pull_request
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   lint:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.12]
+        python-version: ["3.13"]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0  # fetch all branches, needed so we can diff against the target branch
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install flake8

.github/workflows/nbval.yaml

@@ -2,6 +2,9 @@ name: nbval
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   notebook-check:
 
@@ -18,26 +21,21 @@ jobs:
         ]
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
+    - uses: actions/checkout@v7
       with:
-        python-version: "3.12"
-    - name: Install notebook environment
-      run: |
-        python -m pip install --upgrade pip wheel
-        pip install --timeout=300 -r requirements.txt -r docs/notebook_requirements.txt .[test]
-    - name: Run notebook and check output
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
+    - uses: prefix-dev/setup-pixi@v0.10.0
+      with:
+        environments: dev
+    - name: Validate notebook output
       run: |
-        # --nbval-sanitize-with:  pre-process text to remove irrelevant differences (e.g. warning filepaths)
-        pytest --nbval --nbval-sanitize-with docs/nbval_sanitization_rules.cfg docs/${{ matrix.notebook-file }}
-    - name: Run notebooks again, save files
+        pixi run -e dev pytest --nbval --nbval-sanitize-with docs/nbval_sanitization_rules.cfg docs/${{ matrix.notebook-file }}
+    - name: Convert notebook to HTML
       run: |
-        pip install nbconvert[webpdf]
         mkdir docs/artifacts
-        jupyter nbconvert --to html --execute --ExecutePreprocessor.timeout=600 --allow-errors --output artifacts/${{ matrix.notebook-file }}.html docs/${{ matrix.notebook-file }}
+        pixi run -e dev jupyter nbconvert --to html --output artifacts/${{ matrix.notebook-file }}.html docs/${{ matrix.notebook-file }}
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: executed_notebook_${{ matrix.notebook-file }}
         path: docs/artifacts

.github/workflows/publish-to-pypi.yaml

@@ -1,16 +1,27 @@
 name: Publish Python distribution to PyPI and TestPyPI
 
-on: push
+on:
+  push:
+    branches:
+      - master
+      - development
+    tags:
+      - '*'
+
+permissions:
+  contents: read
 
 jobs:
   build:
     name: Build distribution
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.x"
     - name: Install pypa/build
@@ -22,7 +33,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: python-package-distributions
         path: dist/
@@ -42,7 +53,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

.github/workflows/pytest.yaml

@@ -7,42 +7,112 @@ on:
     - development
   pull_request:
 
+permissions:
+  contents: read
 
 jobs:
-  build:
+  check-deps:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
+    - uses: prefix-dev/setup-pixi@v0.10.0
+      with:
+        run-install: false
+    - name: Verify pixi.lock is in sync with pyproject.toml
+      run: |
+        if ! pixi install --locked -e dev; then
+          echo ""
+          echo "::error title=pixi.lock out of sync::pixi.lock does not match pyproject.toml."
+          echo ""
+          echo "To fix, run 'pixi install' locally and commit the updated pixi.lock:"
+          echo ""
+          echo "    pixi install"
+          echo "    git add pixi.lock"
+          echo "    git commit -m 'Update pixi.lock'"
+          exit 1
+        fi
+    - name: Verify min-feature pins match project.dependencies lower bounds
+      run: pixi run -e dev check-deps
 
+  validate-envs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
+    - uses: prefix-dev/setup-pixi@v0.10.0
+      with:
+        environments: core default dev
+        frozen: true
+    - name: Validate core environment
+      run: pixi run -e core python -c "import rdtools; print(rdtools.__version__)"
+    - name: Validate default environment
+      run: pixi run python -c "import rdtools; import jupyter; print('default OK')"
+    - name: Validate dev environment
+      run: pixi run -e dev python -c "import rdtools; import pytest; import jupyter; print('dev OK')"
+
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-        env: [
-          '-r requirements.txt .[test]',
-          '-r requirements-min.txt .[test]',
-          '--upgrade --upgrade-strategy=eager .[test]'
-        ]
-        exclude:
-          - python-version: "3.11"
-            env: '-r requirements-min.txt .[test]'
-          - python-version: "3.12"
-            env: '-r requirements-min.txt .[test]'
-          - python-version: "3.13"
-            env: '-r requirements-min.txt .[test]'
+        environment: [dev-py310, dev-py311, dev-py312, dev-py313, dev-py314]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
+    - uses: prefix-dev/setup-pixi@v0.10.0
+      with:
+        environments: ${{ matrix.environment }}
+    - name: Test with pytest (${{ matrix.environment }})
+      run: pixi run -e ${{ matrix.environment }} test
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v5
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  test-min:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
+    - uses: prefix-dev/setup-pixi@v0.10.0
+      with:
+        environments: dev-min
+    - name: Test with pytest (minimum versions)
+      run: pixi run -e dev-min test
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v5
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  test-latest:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0  # setuptools-scm needs tags to resolve the version
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install ${{ matrix.env }}
+    - name: Install latest versions
       run: |
         python -m pip install --upgrade pip wheel
-        pip install --timeout=300 ${{ matrix.env }}
-    - name: Test with pytest ${{ matrix.env }}
-      run: |
-        python -m pytest --cov=./ --cov-report=xml
+        pip install --timeout=300 --upgrade --upgrade-strategy=eager .[test]
+    - name: Test with pytest (latest)
+      run: python -m pytest --cov=rdtools --cov-report=xml
     - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -11,6 +11,7 @@
 .coveralls.yml
 .coverage
 .coverage.*
+coverage.xml
 htmlcov/
 
 # ignore test cache
@@ -38,5 +39,12 @@ rdtools.egg-info*
 
 *.pickle
 
+# pixi environments (local, not committed)
+.pixi/*
+!.pixi/config.toml
+
+# Windows shortcuts (developer-local)
+*.lnk
+
 # ignore vscode settings
 .vscode/

CITATION.cff

@@ -43,4 +43,4 @@ authors:
   orcid: "https://orcid.org/0000-0002-9867-8930"
 title: "RdTools"
 doi: 10.5281/zenodo.1210316
-url: "https://github.com/NREL/rdtools"
+url: "https://github.com/NatLabRockies/rdtools"

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at RdTools@nrel.gov. All
+reported by contacting the project team at RdTools@nlr.gov. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.