Merge branch 'main' into calib_prod_id

.github/workflows/ci.yml

@@ -13,33 +13,48 @@ env:
   PYTEST_ADDOPTS: --color=yes
 
 jobs:
-  pyflakes:
+  static-code-checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
-      - name: pyflakes
-        run: |
-          pip install pyflakes
-          pyflakes osa
+      - name: Run Ruff
+        uses: chartboost/ruff-action@v1
 
   tests:
-    needs: pyflakes
+    needs: static-code-checks
+    strategy:
+      matrix:
+        include:
+          - python-version: "3.9"
+
+          - python-version: "3.10"
+
+          - python-version: "3.11"
+            extra-args: ['codecov']
+
     runs-on: ubuntu-latest
 
     defaults:
       run:
         shell: bash -leo pipefail {0}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
+      - name: Prepare environment file for Mamba installation
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
+        run: |
+          # setup correct python version
+          sed -i -e "s/- python=.*/- python=$PYTHON_VERSION/g" environment.yml
 
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
@@ -48,17 +63,19 @@ jobs:
           cache-environment: true
           post-cleanup: 'all'
 
-      - name: Install dependencies
-        env:
-          PYTHON_VERSION: 3.11
 
+      - name: Build the package
         run: |
-          python --version
-          echo "Installing additional pip packages"
-          echo "pip install .[test]"
-          pip install .[test]
+          pip install build
+          python -m build
+
+      - name: Install the package
+        run: pip install .[test]
+
+      - name: Install the package in editable mode
+        run: pip install --editable .[test]
 
-      - name: Tests
+      - name: Tests with pytest
         env:
           COVERAGE_PROCESS_START: .coveragerc
           PYTHONPATH: .
@@ -69,8 +86,9 @@ jobs:
           # to initialize the coverage start up.
           echo "create sitecustomize.py"
           echo "import coverage; coverage.process_startup()" > $PYTHONPATH/sitecustomize.py
-          pytest --basetemp=test_osa -v --cov --cov-report=xml osa
+          pytest --basetemp=test_osa -vv --cov --cov-report=xml src
           cat coverage.xml
 
       - name: Codecov
         uses: codecov/codecov-action@v3
+        if: contains(matrix.extra-args, 'codecov')

.github/workflows/deploy.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Publish package to PyPI
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -7,6 +7,7 @@ prov.log
 docs/prov.log
 *.log
 
+
 # Compiled files
 *.py[co]
 *.a
@@ -22,8 +23,7 @@ __pycache__
 # Other generated files
 */cython_version.py
 htmlcov
-.coverage
-.coverage.*
+*coverage*
 MANIFEST
 
 # Sphinx