NI Water Quality Data (#1009)

* Hopefully resolves #1006 * resolved 2023/4 regressions in NI Water data return Also resolved issues with.... * python-poetry/poetry-plugin-export#183 * python-poetry/poetry-plugin-export#239 * actions/upload-artifact#478 * actions/upload-artifact#478 (comment) * after all that it was a collision between the pytest configurations in the ini and in pyproject.toml. pytests now runs locally
andrewbolster · Feb 21, 2024 · c24aa6e · c24aa6e
1 parent 0e15679
commit c24aa6e
Show file tree

Hide file tree

Showing 12 changed files with 3,692 additions and 820 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -90,6 +90,7 @@ jobs:
               run: |
                   pip install --constraint=.github/workflows/constraints.txt poetry
                   poetry --version
+                  poetry self add poetry-plugin-export
 
             - name: Install Nox
               run: |
@@ -128,7 +129,7 @@ jobs:
               if: always() && matrix.session == 'tests'
               uses: "actions/upload-artifact@v4"
               with:
-                  name: coverage-data
+                  name: coverage-data-${{ matrix.os }}-${{ matrix.python-version }}
                   path: ".coverage.*"
 
             - name: Upload documentation
@@ -137,48 +138,3 @@ jobs:
               with:
                   name: docs
                   path: docs/_build
-
-    coverage:
-        runs-on: ubuntu-latest
-        needs: tests
-        steps:
-            - name: Check out the repository
-              uses: actions/checkout@v4
-
-            - name: Set up Python 3.9
-              uses: actions/setup-python@v5
-              with:
-                  python-version: 3.9
-
-            - name: Upgrade pip
-              run: |
-                  pip install --constraint=.github/workflows/constraints.txt pip
-                  pip --version
-
-            - name: Install Poetry
-              run: |
-                  pip install --constraint=.github/workflows/constraints.txt poetry
-                  poetry --version
-
-            - name: Install Nox
-              run: |
-                  pip install --constraint=.github/workflows/constraints.txt nox nox-poetry
-                  nox --version
-
-            - name: Download coverage data
-              uses: actions/download-artifact@v4
-              with:
-                  name: coverage-data
-
-            - name: Combine coverage data and display human readable report
-              uses: wntrblm/nox
-              run: |
-                  nox --force-color --session=coverage
-
-            - name: Create coverage report
-              uses: wntrblm/nox
-              run: |
-                  nox --force-color --session=coverage -- xml
-
-            - name: Upload coverage report
-              uses: codecov/codecov-action@v4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,7 +34,3 @@ repos:
           - id: trailing-whitespace
           - id: mixed-line-ending
           - id: trailing-whitespace
-    - repo: https://github.com/PyCQA/flake8
-      rev: 6.0.0
-      hooks:
-          - id: flake8
diff --git a/.pytest.ini b/.pytest.ini
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -1,4 +1,4 @@
-.. highlight:: shell
+te. highlight:: shell
 
 ============
 Contributing
@@ -69,6 +69,7 @@ Ready to contribute? Here's how to set up `bolster` for local development.
     $ mkvirtualenv bolster
     $ cd bolster/
     $ python setup.py develop
+    $ pre-commit install # Optional, but recommended
 
 4. Create a branch for local development::
 

diff --git a/docs/CNAME b/docs/CNAME
@@ -1 +1 @@
-docs.bolster.online
+docs.bolster.online