Skip to content

Commit 7939cdc

Browse files
authored
Move to pyproject (#147)
* move to pyproj * support py3.14 * rogue dep * fix cov report folder * deploy in nox * remove fixformat in docs * rename reg test
1 parent a585192 commit 7939cdc

14 files changed

Lines changed: 301 additions & 125 deletions

File tree

.github/linters/formatting.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/build_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
micromamba install --yes -n test-env -c conda-forge paraview
4242
python -m pip install --upgrade pip
4343
pip install -e .
44-
pip install sphinx sphinx_rtd_theme sphinx-autodoc-typehints
44+
pip install .[docs]
4545
4646
- name: Build documentation
4747
run: |

.github/workflows/ci.yml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,27 @@ jobs:
3737
- uses: actions/setup-python@v5
3838
with:
3939
python-version: ${{matrix.python-version}}
40-
- name: Install dependencies
41-
run: |
42-
pip install black
43-
pip install isort
44-
pip install codespell
40+
cache: 'pip'
41+
42+
- name: Cache Nox
43+
uses: actions/cache@v4
44+
with:
45+
path: .nox
46+
key: ${{ runner.os }}-lint-nox-${{ hashFiles('noxfile.py') }}
47+
48+
- name: Install nox
49+
run: pip install nox
50+
4551
- name: Formatting and sorting import
46-
run: |
47-
source .github/linters/formatting.sh
48-
format . true
52+
run: nox -s linter
4953

50-
Test-BiRD:
51-
name: Test-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
54+
Unit-Test-BiRD:
55+
name: Unit-Test-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
5256
runs-on: ${{ matrix.os }}
5357
strategy:
5458
fail-fast: false
5559
matrix:
56-
python-version: ['3.10', '3.13']
60+
python-version: ['3.10', '3.14']
5761
os: ['ubuntu-latest', 'macos-latest']
5862
defaults:
5963
run:
@@ -81,14 +85,15 @@ jobs:
8185
run: |
8286
micromamba install --yes -n test-env -c conda-forge paraview
8387
pip install --upgrade pip
84-
pip install .
85-
pip install pytest
88+
pip install --upgrade nox
89+
pip install .[tests]
8690
8791
- name: Test
88-
run: pytest .
92+
run: nox -s tests -- no-reports
93+
8994

90-
Test-pypi-Bird:
91-
name: Test-pypi-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
95+
Unit-Test-pypi-Bird:
96+
name: Unit-Test-pypi-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
9297
runs-on: ${{ matrix.os }}
9398
strategy:
9499
fail-fast: false
@@ -120,14 +125,14 @@ jobs:
120125
run: |
121126
micromamba install --yes -n test-env -c conda-forge paraview
122127
pip install --upgrade pip
123-
pip install nlr-bird
124-
pip install pytest
128+
pip install --upgrade nox
129+
pip install nlr-bird[tests]
125130
126131
- name: Test
127-
run: pytest .
132+
run: nox -s tests -- no-reports
128133

129-
Test-OF:
130-
name: Test-OF (${{ matrix.python-version }}, ${{ matrix.os }})
134+
Regression-Test-OF:
135+
name: Regression-Test-OF (${{ matrix.python-version }}, ${{ matrix.os }})
131136
runs-on: ${{ matrix.os }}
132137
strategy:
133138
fail-fast: false

.github/workflows/codecov.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Python
2525
uses: actions/setup-python@v5
2626
with:
27-
python-version: '3.13'
27+
python-version: '3.14'
2828
cache: 'pip'
2929

3030
- name: Set up micromamba
@@ -42,13 +42,13 @@ jobs:
4242
run: |
4343
micromamba install --yes -n test-env -c conda-forge paraview
4444
pip install --upgrade pip
45-
pip install pytest
46-
pip install pytest-cov
47-
pip install -e .
45+
pip install --upgrade nox
46+
pip install .[tests]
4847
4948
- name: Generate coverage report
5049
run: |
51-
pytest --cov=./ --cov-report=xml:coverage.xml
50+
pytest --cov=./ --cov-report=xml:coverage.xml
51+
5252
- name: Upload coverage to Codecov
5353

5454
uses: codecov/codecov-action@v5

.github/workflows/deploy_docs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
run: |
4343
micromamba install --yes -n test-env -c conda-forge paraview
4444
pip install --upgrade pip
45-
pip install -e .
46-
pip install sphinx sphinx_rtd_theme sphinx-autodoc-typehints
45+
pip install -e .[docs]
4746
4847
- name: Build documentation
4948
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# <ins>Bi</ins>o <ins>R</ins>eactor <ins>D</ins>esign (BiRD) [![bird-CI](https://github.com/NatLabRockies/BioReactorDesign/actions/workflows/ci.yml/badge.svg)](https://github.com/NatLabRockies/BioReactorDesign/actions/workflows/ci.yml) [![bird-pyversion](https://img.shields.io/pypi/pyversions/NLR-bird.svg)](https://pypi.org/project/NLR-bird/) [![coverage](https://codecov.io/gh/NREL/BioReactorDesign/graph/badge.svg)](https://app.codecov.io/gh/nrel/bioreactordesign) [![bird-pypi](https://badge.fury.io/py/nlr-bird.svg)](https://badge.fury.io/py/nlr-bird)
1+
# <ins>Bi</ins>o <ins>R</ins>eactor <ins>D</ins>esign (BiRD) [![bird-CI](https://github.com/NatLabRockies/BioReactorDesign/actions/workflows/ci.yml/badge.svg)](https://github.com/NatLabRockies/BioReactorDesign/actions/workflows/ci.yml) [![bird-pyversion](https://img.shields.io/pypi/pyversions/NLR-bird.svg)](https://pypi.org/project/NLR-bird/) [![coverage](https://codecov.io/gh/NatlabRockies/BioReactorDesign/graph/badge.svg)](https://app.codecov.io/gh/nrel/bioreactordesign) [![bird-pypi](https://badge.fury.io/py/nlr-bird.svg)](https://badge.fury.io/py/nlr-bird)
22

33
## Quick start
44
1. Follow the steps to install the python package (see `Installation of python package for developers` or `Installation of python package for users` below)

bird/requirements.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

bird/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""Bio reactor design version"""
22

3-
__version__ = "0.0.52"
3+
__version__ = "0.0.53"

dist.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/source/contribute.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ You can automatically enforce the formatting guidelines with
1212

1313
.. code-block:: console
1414
15-
pip install black isort codespell
16-
bash fixFormat.sh
15+
pip install nox
16+
nox -s lint -- write
1717
1818
1919
Tests

0 commit comments

Comments
 (0)