Skip to content

Commit 4ecb32c

Browse files
committed
Merge branch 'master' into tests/grep-errors-standalone
2 parents 4217679 + 921dc1c commit 4ecb32c

File tree

161 files changed

+2690
-1385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+2690
-1385
lines changed

.azure/app-cloud-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
name: "commands_and_api"
7676
# 'App: quick_start': # TODO: Failed during installation
7777
# name: "quick_start"
78-
timeoutInMinutes: "30"
78+
timeoutInMinutes: "20"
7979
cancelTimeoutInMinutes: "2"
8080
# values: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#workspace
8181
workspace:

.github/checkgroup.yml

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ subprojects:
5050
#- "pl-cpu (windows-2022, lightning, 3.7, 1.9, oldest)"
5151
- "make-doctest (pytorch)"
5252
- "make-html (pytorch)"
53-
- "mypy"
5453
- "pytorch-lightning (GPUs)"
5554
- "pytorch-lightning (HPUs)"
5655
- "pytorch-lightning (IPUs)"
@@ -60,7 +59,7 @@ subprojects:
6059
# TODO: since this job has intermittent availability, it cannot be required or it will block all PL PRs from forks
6160
#- "test-on-tpus"
6261

63-
- id: "pytorch_lightning: CPU"
62+
- id: "pytorch_lightning: CPU workflow"
6463
paths:
6564
- ".github/workflows/ci-pytorch-tests.yml"
6665
checks:
@@ -87,7 +86,7 @@ subprojects:
8786
- "pl-cpu (windows-2022, lightning, 3.10, 1.12)"
8887
#- "pl-cpu (windows-2022, lightning, 3.7, 1.9, oldest)"
8988

90-
- id: "pytorch_lightning: Slow"
89+
- id: "pytorch_lightning: Slow workflow"
9190
paths:
9291
- ".github/workflows/ci-pytorch-tests-slow.yml"
9392
checks:
@@ -114,7 +113,7 @@ subprojects:
114113
checks:
115114
- "pytorch-lightning (IPUs)"
116115

117-
- id: "pytorch-lightning: TPU"
116+
- id: "pytorch-lightning: TPU workflow"
118117
paths:
119118
- ".github/workflows/tpu-tests.yml"
120119
checks:
@@ -181,7 +180,6 @@ subprojects:
181180
- "lite-cpu (ubuntu-20.04, lightning, 3.8, 1.12)"
182181
- "lite-cpu (windows-2022, lightning, 3.8, 1.12)"
183182
- "lightning-lite (GPUs)"
184-
- "mypy"
185183
# Lite also requires PL checks as it depends on Lite
186184
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10)"
187185
- "pl-cpu (macOS-11, pytorch, 3.9, 1.11)"
@@ -254,8 +252,7 @@ subprojects:
254252
- "requirements/app/**"
255253
- "src/lightning_app/**"
256254
- "tests/tests_app/**"
257-
- "examples/app_*" # some tests_app tests call examples files
258-
- ".github/workflows/ci-app-tests.yml"
255+
- "examples/app_*/**" # some tests_app tests call examples files
259256
- "setup.py"
260257
- ".actions/**"
261258
checks:
@@ -272,13 +269,26 @@ subprojects:
272269
- "app-pytest (windows-2022, app, 3.8, oldest)"
273270
- "app-pytest (windows-2022, lightning, 3.8, latest)"
274271

272+
- id: "lightning_app: Tests workflow"
273+
paths:
274+
- ".github/workflows/ci-app-tests.yml"
275+
checks:
276+
- "app-pytest (macOS-11, app, 3.8, latest)"
277+
- "app-pytest (macOS-11, app, 3.8, oldest)"
278+
- "app-pytest (macOS-11, lightning, 3.9, latest)"
279+
- "app-pytest (ubuntu-20.04, app, 3.8, latest)"
280+
- "app-pytest (ubuntu-20.04, app, 3.8, oldest)"
281+
- "app-pytest (ubuntu-20.04, lightning, 3.9, latest)"
282+
- "app-pytest (windows-2022, app, 3.8, latest)"
283+
- "app-pytest (windows-2022, app, 3.8, oldest)"
284+
- "app-pytest (windows-2022, lightning, 3.8, latest)"
285+
275286
- id: "lightning_app: Examples"
276287
paths:
277288
- "requirements/app/**"
278289
- "src/lightning_app/**"
279290
- "tests/tests_app_examples/**"
280-
- "examples/app_*"
281-
- ".github/workflows/ci-app-examples.yml"
291+
- "examples/app_*/**"
282292
- "setup.py"
283293
- ".actions/**"
284294
checks:
@@ -292,6 +302,20 @@ subprojects:
292302
- "app-examples (windows-2022, app, 3.9, oldest)"
293303
- "app-examples (windows-2022, lightning, 3.9, latest)"
294304

305+
- id: "lightning_app: Examples workflow"
306+
paths:
307+
- ".github/workflows/ci-app-examples.yml"
308+
checks:
309+
- "app-examples (macOS-11, app, 3.9, latest)"
310+
- "app-examples (macOS-11, app, 3.9, oldest)"
311+
- "app-examples (macOS-11, lightning, 3.9, latest)"
312+
- "app-examples (ubuntu-20.04, app, 3.9, latest)"
313+
- "app-examples (ubuntu-20.04, app, 3.9, oldest)"
314+
- "app-examples (ubuntu-20.04, lightning, 3.9, latest)"
315+
- "app-examples (windows-2022, app, 3.9, latest)"
316+
- "app-examples (windows-2022, app, 3.9, oldest)"
317+
- "app-examples (windows-2022, lightning, 3.9, latest)"
318+
295319
- id: "lightning_app: Azure"
296320
paths:
297321
- ".azure/app-cloud-e2e.yml"
@@ -313,7 +337,10 @@ subprojects:
313337
- id: "mypy"
314338
paths:
315339
- ".github/workflows/code-checks.yml"
340+
- "requirements/**"
341+
- "src/**"
316342
- "pyproject.toml" # includes mypy config
343+
- ".actions/**"
317344
checks:
318345
- "mypy"
319346

.github/workflows/ci-app-examples.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ on:
1212
- "src/lightning_app/**"
1313
- "tests/tests_app_examples/**"
1414
- "examples/app_*"
15-
- "requirements/app/**"
15+
- "requirements/app/*"
16+
- "!requirements/app/docs.txt"
1617
- "setup.py"
1718
- ".actions/**"
1819

.github/workflows/ci-app-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ on:
1111
- "src/lightning_app/**"
1212
- "tests/tests_app/**"
1313
- "examples/app_*" # some tests_app tests call examples files
14-
- "requirements/app/**"
14+
- "requirements/app/*"
15+
- "!requirements/app/docs.txt"
1516
- "setup.py"
1617
- ".actions/**"
1718

.github/workflows/ci-lite-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
branches: [master, "release/*"]
99
types: [opened, reopened, ready_for_review, synchronize] # add `ready_for_review` since draft is skipped
1010
paths:
11-
- "requirements/lite/**"
11+
- "requirements/lite/*"
12+
- "!requirements/lite/docs.txt"
1213
- "src/lightning_lite/**"
1314
- "tests/tests_lite/**"
1415
- "setup.cfg" # includes pytest config

.github/workflows/ci-pkg-install.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- "setup.py"
1313
- "src/**"
1414
- "requirements/**"
15+
- "!requirements/*/docs.txt"
1516

1617
concurrency:
1718
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/ci-pytorch-dockers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
- "dockers/**"
1010
- "!dockers/README.md"
1111
- "requirements.txt"
12-
- "requirements/*.txt"
13-
- "requirements/pytorch/*"
12+
- "requirements/**"
13+
- "!requirements/*/docs.txt"
1414
- "environment.yml"
1515
- ".github/workflows/*docker*.yml"
1616
- "setup.py"

.github/workflows/ci-pytorch-tests-slow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ on:
99
types: [opened, reopened, ready_for_review, synchronize] # add `ready_for_review` since draft is skipped
1010
paths:
1111
- ".github/workflows/ci-pytorch-tests-slow.yml"
12-
- "requirements/pytorch/**"
12+
- "requirements/pytorch/*"
1313
- "src/pytorch_lightning/**"
1414
- "tests/tests_pytorch/**"
1515
- "setup.cfg" # includes pytest config
16-
- "requirements/lite/**"
16+
- "requirements/lite/*"
1717
- "src/lightning_lite/**"
1818
- ".actions/**"
19+
- "!requirements/*/docs.txt"
1920

2021
concurrency:
2122
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/ci-pytorch-tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ on:
88
branches: [master, "release/*"]
99
types: [opened, reopened, ready_for_review, synchronize] # add `ready_for_review` since draft is skipped
1010
paths:
11-
- "requirements/pytorch/**"
11+
- "requirements/pytorch/*"
1212
- "src/pytorch_lightning/**"
1313
- "tests/tests_pytorch/**"
1414
- "tests/legacy/back-compatible-versions.txt"
1515
- "setup.cfg" # includes pytest config
1616
- ".github/workflows/ci-pytorch-tests.yml"
17-
- "requirements/lite/**"
17+
- "requirements/lite/*"
1818
- "src/lightning_lite/**"
1919
- ".actions/**"
20+
- "!requirements/*/docs.txt"
2021

2122
concurrency:
2223
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/code-checks.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
branches: [master, "release/*"]
66
pull_request:
77
branches: [master, "release/*"]
8+
paths:
9+
- ".github/workflows/code-checks.yml"
10+
- "requirements/**"
11+
- "src/**"
12+
- "pyproject.toml" # includes mypy config
13+
- "actions/**"
814

915
concurrency:
1016
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

0 commit comments

Comments
 (0)