Skip to content

Commit

Permalink
NI Water Quality Data (#1009)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
andrewbolster committed Feb 21, 2024
1 parent 0e15679 commit c24aa6e
Show file tree
Hide file tree
Showing 12 changed files with 3,692 additions and 820 deletions.
48 changes: 2 additions & 46 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions .pytest.ini

This file was deleted.

3 changes: 2 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. highlight:: shell
te. highlight:: shell

============
Contributing
Expand Down Expand Up @@ -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::

Expand Down
2 changes: 1 addition & 1 deletion docs/CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docs.bolster.online
docs.bolster.online
Loading

0 comments on commit c24aa6e

Please sign in to comment.