Skip to content

Commit 7675f93

Browse files
Merge branch 'master' into issue-21255-cli-hparams-override
2 parents 429a16d + 612ab08 commit 7675f93

File tree

71 files changed

+590
-1301
lines changed

Some content is hidden

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

71 files changed

+590
-1301
lines changed

.github/ISSUE_TEMPLATE/1_bug_report.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ body:
3838
- "v2.3"
3939
- "v2.4"
4040
- "v2.5"
41+
- "v2.6"
4142
- "master"
4243
validations:
4344
required: true
@@ -102,7 +103,7 @@ body:
102103
<summary>Current environment</summary>
103104
104105
```
105-
#- PyTorch Lightning Version (e.g., 2.5.0):
106+
#- PyTorch Lightning Version (e.g., 2.6.0):
106107
#- PyTorch Version (e.g., 2.5):
107108
#- Python version (e.g., 3.12):
108109
#- OS (e.g., Linux):

.github/advanced-issue-labeler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ policy:
1818
keys: ["v2_4", "v2.4", "2.4.x"]
1919
- name: "ver: 2.5.x"
2020
keys: ["v2_5", "v2.5", "2.5.x"]
21-
- name: "ver: 2.5.x"
21+
- name: "ver: 2.6.x"
22+
keys: ["v2_6", "v2.6", "2.6.x"]
23+
- name: "ver: 2.7.x"
2224
keys: ["master"]

.github/stale.yml

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

.github/workflows/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ The published Docker Hub project is https://hub.docker.com/r/pytorchlightning/py
6767
| workflow file | action |
6868
| ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
6969
| .github/mergify.yml | Label PRs as conflicts or ready, and request reviews if needed. |
70-
| .github/stale.yml | Close inactive issues/PRs sometimes after adding the "won't fix" label to them. |
7170
| .github/workflows/probot-auto-cc.yml <br> .github/lightning-probot.yml | Notify maintainers of interest depending on labels added to an issue We utilize lightning-probot forked from PyTorch’s probot. |
7271
| .github/workflows/probot-check-group.yml <br> .github/checkgroup.yml | Checks whether the relevant jobs were successfully run based on the changed files in the PR |
7372
| .pre-commit-config.yaml | It applies a set of linters and formatters and can be registered with your local dev. If needed [bot](https://pre-commit.ci/) pushc changes to each PRs. |

.github/workflows/_build-packages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
mkdir -p pypi/${{ matrix.pkg-name }}
4242
cp dist/* pypi/${{ matrix.pkg-name }}/
4343
44-
- uses: actions/upload-artifact@v6
44+
- uses: actions/upload-artifact@v7
4545
with:
4646
name: ${{ inputs.artifact-name }}-${{ matrix.pkg-name }}
4747
path: pypi
@@ -51,7 +51,7 @@ jobs:
5151
needs: build-packages
5252
runs-on: ubuntu-22.04
5353
steps:
54-
- uses: actions/download-artifact@v7
54+
- uses: actions/download-artifact@v8
5555
with: # download all build artifacts
5656
pattern: ${{ inputs.artifact-name }}-*
5757
merge-multiple: true
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Keep artifact
6464
run: python -c "print('DAYS=' + str(5 if '${{ github.event_name }}'.startswith('pull_request') else 0))" >> $GITHUB_ENV
65-
- uses: actions/upload-artifact@v6
65+
- uses: actions/upload-artifact@v7
6666
with:
6767
name: ${{ inputs.artifact-name }}
6868
path: pypi

.github/workflows/_legacy-checkpoints.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
python -c "print('AWS_RUN=' + str('' if '${{inputs.push_to_s3}}' == 'true' else '--dryrun'))" >> $GITHUB_ENV
109109
110110
- name: Upload checkpoints to GitHub Actions artifact
111-
uses: actions/upload-artifact@v6
111+
uses: actions/upload-artifact@v7
112112
with:
113113
name: checkpoints-${{ github.sha }}
114114
path: ${{ env.LEGACY_FOLDER }}/checkpoints/

.github/workflows/call-clear-cache.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
cron-clear:
2525
if: github.event_name == 'schedule' || github.event_name == 'pull_request'
26-
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.2
26+
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.3
2727
with:
2828
scripts-ref: v0.15.2
2929
dry-run: ${{ github.event_name == 'pull_request' }}
@@ -32,7 +32,7 @@ jobs:
3232

3333
direct-clear:
3434
if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
35-
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.2
35+
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.3
3636
with:
3737
scripts-ref: v0.15.2
3838
dry-run: ${{ github.event_name == 'pull_request' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/setup-python@v6
5151
with:
5252
python-version: ${{ matrix.python-version }}
53-
- uses: actions/download-artifact@v7
53+
- uses: actions/download-artifact@v8
5454
with:
5555
name: dist-packages-${{ github.sha }}
5656
path: dist

.github/workflows/ci-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
check:
11-
uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.15.2
11+
uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.15.3
1212
with:
1313
# skip azure due to the wrong schema file by MSFT
1414
# https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,15 @@ jobs:
4747
- { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
4848
- { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
4949

50-
# Test "fabric" package with PyTorch 2.6-2.9
50+
# Test "fabric" package with PyTorch 2.6-2.10
5151
- { pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
5252
- { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
5353
- { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.8" }
5454
- { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.9" }
55+
- { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.10" }
5556
- { pkg-name: "fabric", python-version: "3.13", pytorch-version: "2.8" }
57+
- { pkg-name: "fabric", python-version: "3.13", pytorch-version: "2.9" }
58+
- { pkg-name: "fabric", python-version: "3.13", pytorch-version: "2.10" }
5659

5760
# Test minimum supported versions (oldest)
5861
- { pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
@@ -101,7 +104,7 @@ jobs:
101104
python -m lightning_utilities.cli requirements set-oldest \
102105
--req_files "['requirements/fabric/base.txt', 'requirements/fabric/strategies.txt', 'requirements/fabric/test.txt']"
103106
uv pip install "cython<3.0" wheel
104-
uv pip install "pyyaml==5.4" --no-build-isolation
107+
uv pip install "pyyaml==6.0.0" --no-build-isolation
105108
# This script removes any line containing "error::FutureWarning" from pyproject.toml
106109
uv pip install -r requirements/ci.txt
107110
python .actions/assistant.py prune_pytest_as_errors
@@ -162,7 +165,7 @@ jobs:
162165
coverage xml
163166
164167
- name: Upload coverage to Codecov
165-
uses: codecov/codecov-action@v5
168+
uses: codecov/codecov-action@v6
166169
# see: https://github.com/actions/toolkit/issues/399
167170
continue-on-error: true
168171
with:

0 commit comments

Comments
 (0)