Skip to content

Commit 625bec6

Browse files
authored
phase out test-time-requirements.txt (#219)
1 parent fa6007f commit 625bec6

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

.github/workflows/conda.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@ jobs:
2222
with:
2323
auto-update-conda: true
2424
python-version: ${{ matrix.python-version }}
25-
- name: Install dependencies with pip in conda
26-
run: |
27-
python -m pip install --upgrade pip
28-
pip install -r test-time-requirements.txt
29-
- name: Install PyPartMC
30-
run: |
31-
pip install -e .
32-
- name: Test with pytest
33-
run: |
25+
- run: python -m pip install --upgrade pip
26+
- run: pip install -e .[tests]
27+
- run: |
3428
cd tests
3529
pytest -v -s -We -p no:unraisableexception -k 'not test_todos_annotated' .

.github/workflows/pylint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ jobs:
2121
- run: |
2222
python -m pip install --upgrade pip
2323
pip install pylint
24-
pip install -r test-time-requirements.txt
25-
pip install -e .
24+
pip install -e .[tests]
2625
- run: pylint --unsafe-load-any-extension=y --disable=fixme,no-member,trailing-newlines,missing-module-docstring,missing-class-docstring,missing-function-docstring,unnecessary-pass $(git ls-files '*.py')

.github/workflows/tests+pypi.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
with:
2323
submodules: recursive
2424
fetch-depth: 0 # https://github.com/pypa/setuptools_scm/issues/480
25-
- run: pip install -r test-time-requirements.txt
26-
- run: DEBUG=1 VERBOSE=1 pip install --verbose -e .
25+
- run: DEBUG=1 VERBOSE=1 pip install --verbose -e .[tests]
2726
- env:
2827
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2928
run: pytest --durations=10 -v -s -We -p no:unraisableexception tests/test_todos_annotated.py
@@ -71,7 +70,6 @@ jobs:
7170

7271
- run: python -m pip install --upgrade pip==22.1.2
7372
- run: pip install build wheel
74-
- run: pip install -r test-time-requirements.txt
7573

7674
- run: |
7775
unset CI
@@ -99,9 +97,11 @@ jobs:
9997
name: dist
10098
path: dist
10199

102-
- run: |
100+
- env:
101+
SYSTEM_VERSION_COMPAT: 0
102+
run: |
103103
pip debug --verbose
104-
SYSTEM_VERSION_COMPAT=0 pip install dist/*.whl
104+
for i in dist/*.whl; do pip install $i[tests]; done;
105105
pip show --verbose PyPartMC
106106
107107
### make sure PyPartMC is not picked up from a local folder

setup.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,11 @@ def build_extension(self, ext): # pylint: disable=too-many-branches
147147
"Documentation": "https://open-atmos.github.io/PyPartMC",
148148
"Source": "https://github.com/open-atmos/PyPartMC/",
149149
},
150+
extras_require={
151+
"tests": [
152+
"pytest",
153+
"fastcore!=1.5.8", # https://github.com/fastai/fastcore/issues/439
154+
"ghapi",
155+
]
156+
},
150157
)

test-time-requirements.txt

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

0 commit comments

Comments
 (0)