diff --git a/.github/workflows/ci_test-base.yml b/.github/workflows/ci_test-base.yml index ed8a2e30949b7..0e84642e2f810 100644 --- a/.github/workflows/ci_test-base.yml +++ b/.github/workflows/ci_test-base.yml @@ -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 @@ -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 diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index 3d3f7d11570a4..ba8d804414993 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -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... diff --git a/requirements/extra.txt b/requirements/extra.txt index 85437327bce06..a05c4971ac450 100644 --- a/requirements/extra.txt +++ b/requirements/extra.txt @@ -4,7 +4,7 @@ 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 -onnx>=1.7.0 +# onnx>=1.7.0 onnxruntime>=1.3.0 hydra-core>=1.0 https://github.com/PyTorchLightning/fairscale/archive/pl_1.2.0.zip diff --git a/requirements/test.txt b/requirements/test.txt index 60c861cea9c50..84ddb2f981b54 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,11 +2,10 @@ coverage>=5.2 codecov>=2.1 pytest>=6.0 pytest-cov>2.10 -pytest-xdist +# 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 diff --git a/setup.cfg b/setup.cfg index 63b026a591e00..ab1e1e8c1addc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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