Skip to content

Commit 156847b

Browse files
authored
CI: resume testing with py3.8 (#6516)
* testing on python 3.8 * req
1 parent 02fa32b commit 156847b

File tree

5 files changed

+5
-12
lines changed

5 files changed

+5
-12
lines changed

.github/workflows/ci_test-base.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ jobs:
5151
- name: Install dependencies
5252
run: |
5353
python -m pip install --upgrade --user pip
54-
pip install --requirement ./requirements.txt --quiet --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
55-
pip install --requirement ./requirements/test.txt --quiet --upgrade-strategy only-if-needed
56-
# pip install tox coverage
54+
pip install --requirement ./requirements.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
55+
pip install "pytest>6.0" "pytest-cov>2.10" --upgrade-strategy only-if-needed
5756
python --version
5857
pip --version
5958
pip list
@@ -69,7 +68,7 @@ jobs:
6968
- name: Test Package [only]
7069
run: |
7170
# NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
72-
coverage run --source pytorch_lightning -m pytest pytorch_lightning -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
71+
python -m pytest pytorch_lightning -v --cov=pytorch_lightning --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
7372
7473
- name: Upload pytest test results
7574
uses: actions/upload-artifact@v2

.github/workflows/ci_test-full.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
os: [ubuntu-18.04, windows-2019, macOS-10.15]
1818
python-version: [3.6, 3.7, 3.8]
1919
requires: ['minimal', 'latest']
20-
exclude:
21-
# # todo: segmentation fault for minimal and hanging for latest
22-
- python-version: 3.8
23-
os: ubuntu-18.04
2420

2521
# Timeout: https://stackoverflow.com/a/59076067/4521646
2622
timeout-minutes: 35 # TODO: the macOS is taking too long, probably caching did not work...

requirements/extra.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ matplotlib>3.1
44
horovod>=0.21.2 # no need to install with [pytorch] as pytorch is already installed
55
omegaconf>=2.0.1
66
torchtext>=0.5
7-
onnx>=1.7.0
7+
# onnx>=1.7.0
88
onnxruntime>=1.3.0
99
hydra-core>=1.0
1010
https://github.com/PyTorchLightning/fairscale/archive/pl_1.2.0.zip

requirements/test.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ coverage>=5.2
22
codecov>=2.1
33
pytest>=6.0
44
pytest-cov>2.10
5-
pytest-xdist
5+
# pytest-xdist
66
flake8>=3.6
77
check-manifest
88
twine==3.2
9-
# scipy>=0.13.3
109
scikit-learn>=0.22.2
1110
scikit-image>=0.17.2
1211
isort>=5.6.4

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ exclude_lines =
3939
pass
4040
rank_zero_warn
4141
raise NotImplementedError
42-
4342
# TODO: figure out how to get codecov to pick up the test results on these backends
4443
# The actual coverage for each is 90%+
4544
# *metrics (94%+) are temporarily removed from testing while tests speed up

0 commit comments

Comments
 (0)