Skip to content

Commit

Permalink
CI: resume testing with py3.8 (#6516)
Browse files Browse the repository at this point in the history
* testing on python 3.8

* req

(cherry picked from commit 156847b)
  • Loading branch information
Borda authored and lexierule committed Mar 16, 2021
1 parent 50aedad commit 342d097
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 15 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci_test-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade --user pip
pip install --requirement ./requirements.txt --quiet --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
pip install --requirement ./requirements/test.txt --quiet --upgrade-strategy only-if-needed
# pip install tox coverage
pip install --requirement ./requirements.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
pip install "pytest>6.0" "pytest-cov>2.10" --upgrade-strategy only-if-needed
python --version
pip --version
pip list
Expand All @@ -69,7 +68,7 @@ jobs:
- name: Test Package [only]
run: |
# NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
coverage run --source pytorch_lightning -m pytest pytorch_lightning -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
python -m pytest pytorch_lightning -v --cov=pytorch_lightning --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
- name: Upload pytest test results
uses: actions/upload-artifact@v2
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci_test-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
os: [ubuntu-18.04, windows-2019, macOS-10.15]
python-version: [3.6, 3.7, 3.8]
requires: ['minimal', 'latest']
exclude:
# # todo: segmentation fault for minimal and hanging for latest
- python-version: 3.8
os: ubuntu-18.04

# Timeout: https://stackoverflow.com/a/59076067/4521646
timeout-minutes: 35 # TODO: the macOS is taking too long, probably caching did not work...
Expand Down
4 changes: 2 additions & 2 deletions requirements/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
matplotlib>3.1
horovod>=0.21.2 # no need to install with [pytorch] as pytorch is already installed
omegaconf>=2.0.1
torchtext>=0.5, <0.7 # TODO: temporary fix fix for compatibility
onnx>=1.7.0
torchtext>=0.5
# onnx>=1.7.0
onnxruntime>=1.3.0
hydra-core>=1.0
https://github.com/PyTorchLightning/fairscale/archive/pl_1.2.0.zip
8 changes: 4 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
coverage>=5.0
coverage>=5.2
codecov>=2.1
pytest>=5.0
# pytest-cov
pytest>=6.0
pytest-cov>2.10
# pytest-xdist
flake8>=3.6
check-manifest
twine==3.2
# scipy>=0.13.3
scikit-learn>=0.22.2
scikit-image>=0.17.2
isort>=5.6.4
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ exclude_lines =
pass
rank_zero_warn
raise NotImplementedError

# TODO: figure out how to get codecov to pick up the test results on these backends
# The actual coverage for each is 90%+
# *metrics (94%+) are temporarily removed from testing while tests speed up
Expand Down

0 comments on commit 342d097

Please sign in to comment.