Skip to content

Commit 56cd883

Browse files
authored
Merge pull request Lightning-AI#13250 from PyTorchLightning/ci/rm-base
CI: Remove simple test `ci_test-base.yml`
1 parent 83436ee commit 56cd883

File tree

4 files changed

+25
-96
lines changed

4 files changed

+25
-96
lines changed

.github/workflows/README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323

2424
## Documentation
2525

26-
| workflow file | action |
27-
| ---------------------------------- | -------------------------------------------------------------------------------------------- |
28-
| .github/workflows/ci_test-base.yml | Validate code examples in docstrings in the package with pytest’s doctest. |
29-
| .github/workflows/docs-checks.yml | Run doctest, build documentation, and upload built docs to make them available as artifacts. |
30-
| .circleci/config.yml (build-docs) | Build docs and host them on output.circleci-artifacts.com for easy access to the built docs. |
31-
| .github/workflows/docs-link.yml | Provide a direct link to built docs on output.circleci-artifacts.com. |
26+
| workflow file | action |
27+
| --------------------------------- | -------------------------------------------------------------------------------------------- |
28+
| .github/workflows/docs-checks.yml | Run doctest, build documentation, and upload built docs to make them available as artifacts. |
29+
| .circleci/config.yml (build-docs) | Build docs and host them on output.circleci-artifacts.com for easy access to the built docs. |
30+
| .github/workflows/docs-link.yml | Provide a direct link to built docs on output.circleci-artifacts.com. |
3231

3332
## Code Quality
3433

.github/workflows/ci_test-base.yml

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

.github/workflows/ci_test-conda.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,23 @@ jobs:
3535

3636
- uses: actions/checkout@v2
3737

38-
- name: Update dependencies
38+
- name: Update base dependencies
39+
run: |
40+
conda info
41+
conda list
42+
pip install -r requirements/test.txt
43+
44+
- name: DocTests
45+
run: |
46+
coverage run --source pytorch_lightning -m pytest pytorch_lightning
47+
48+
- name: Update all dependencies
3949
env:
4050
HOROVOD_BUILD_ARCH_FLAGS: "-mfma"
4151
HOROVOD_WITHOUT_MXNET: 1
4252
HOROVOD_WITHOUT_TENSORFLOW: 1
4353
run: |
4454
set -e
45-
conda info
46-
conda list
4755
# adjust versions according installed Torch version
4856
python ./requirements/adjust-versions.py requirements/extra.txt
4957
python ./requirements/adjust-versions.py requirements/examples.txt
@@ -58,9 +66,9 @@ jobs:
5866
- name: Pull legacy checkpoints
5967
run: bash .actions/pull_legacy_checkpoints.sh
6068

61-
- name: Tests
69+
- name: UnitTests
6270
run: |
63-
coverage run --source pytorch_lightning -m pytest --timeout 150 pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
71+
coverage run --source pytorch_lightning -m pytest --timeout 150 tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
6472
6573
- name: Upload pytest results
6674
uses: actions/upload-artifact@v2

.github/workflows/ci_test-full.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ jobs:
8484
flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1)
8585
url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1)
8686
pip install -r requirements.txt --upgrade $flag --find-links "https://download.pytorch.org/whl/${url}"
87-
# adjust versions according installed Torch version
88-
python ./requirements/adjust-versions.py requirements/examples.txt
89-
pip install -r requirements/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
9087
pip install -r requirements/test.txt --upgrade
9188
pip list
9289
shell: bash
9390

91+
- name: DocTests
92+
run: coverage run --source pytorch_lightning -m pytest pytorch_lightning
93+
9494
- name: Install extra dependencies
9595
run: |
9696
# adjust versions according installed Torch version
@@ -126,13 +126,16 @@ jobs:
126126
run: |
127127
python requirements/check-avail-extras.py
128128
129-
- name: Tests
129+
- name: UnitTests
130130
run: |
131131
# NOTE: do not include coverage report here, see: https://github.com/nedbat/coveragepy/issues/1003
132132
coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.requires }}-${{ matrix.release }}.xml
133133
134134
- name: Examples
135135
run: |
136+
# adjust versions according installed Torch version
137+
python ./requirements/adjust-versions.py requirements/examples.txt
138+
pip install -r requirements/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
136139
python -m pytest pl_examples -v --durations=10
137140
138141
- name: Upload pytest results

0 commit comments

Comments
 (0)