Skip to content

Commit cc125d4

Browse files
Merge branch 'master' into fix/process-safe-port-manager
2 parents b72ba13 + a883890 commit cc125d4

File tree

11 files changed

+19
-18
lines changed

11 files changed

+19
-18
lines changed

.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@v4
44+
- uses: actions/upload-artifact@v5
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@v5
54+
- uses: actions/download-artifact@v6
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@v4
65+
- uses: actions/upload-artifact@v5
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@v4
111+
uses: actions/upload-artifact@v5
112112
with:
113113
name: checkpoints-${{ github.sha }}
114114
path: ${{ env.LEGACY_FOLDER }}/checkpoints/

.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@v5
53+
- uses: actions/download-artifact@v6
5454
with:
5555
name: dist-packages-${{ github.sha }}
5656
path: dist

.github/workflows/docs-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Upload built docs
135135
if: ${{ matrix.target == 'html' }}
136-
uses: actions/upload-artifact@v4
136+
uses: actions/upload-artifact@v5
137137
with:
138138
name: docs-${{ matrix.pkg-name }}-${{ github.sha }}
139139
path: docs/build/html/
@@ -153,7 +153,7 @@ jobs:
153153
# use input if dispatch or git tag
154154
VERSION: ${{ inputs.version || github.ref_name }}
155155
steps:
156-
- uses: actions/download-artifact@v5
156+
- uses: actions/download-artifact@v6
157157
with:
158158
name: docs-${{ matrix.pkg-name }}-${{ github.sha }}
159159
path: docs/build/html/

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
nb-dirs: ${{ env.NB_DIRS }}
4141
allow-local-changes: "true"
4242

43-
- uses: actions/upload-artifact@v4
43+
- uses: actions/upload-artifact@v5
4444
with:
4545
name: nightly-packages-${{ github.sha }}
4646
path: dist
@@ -54,7 +54,7 @@ jobs:
5454
PKG_NAME: "lightning"
5555
steps:
5656
- uses: actions/checkout@v5 # needed to use local composite action
57-
- uses: actions/download-artifact@v5
57+
- uses: actions/download-artifact@v6
5858
with:
5959
name: nightly-packages-${{ github.sha }}
6060
path: dist

.github/workflows/release-pkg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.event_name == 'release'
3939
steps:
4040
- uses: actions/checkout@v5
41-
- uses: actions/download-artifact@v5
41+
- uses: actions/download-artifact@v6
4242
with:
4343
name: dist-packages-${{ github.sha }}
4444
path: dist
@@ -140,7 +140,7 @@ jobs:
140140
name: ["FABRIC", "PYTORCH", "LIGHTNING"]
141141
steps:
142142
- uses: actions/checkout@v5 # needed for local action below
143-
- uses: actions/download-artifact@v5
143+
- uses: actions/download-artifact@v6
144144
with:
145145
name: dist-packages-${{ github.sha }}
146146
path: dist
@@ -165,7 +165,7 @@ jobs:
165165
name: ["FABRIC", "PYTORCH", "LIGHTNING"]
166166
steps:
167167
- uses: actions/checkout@v5 # needed for local action below
168-
- uses: actions/download-artifact@v5
168+
- uses: actions/download-artifact@v6
169169
with:
170170
name: dist-packages-${{ github.sha }}
171171
path: dist

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ ignore = [
9191
]
9292
"src/**" = [
9393
"S101", # todo: Use of `assert` detected
94-
"S105", "S106", "S107", # todo: Possible hardcoded password: ...
9594
"S113", # todo: Probable use of requests call without timeout
9695
"S301", # todo: `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
9796
"S324", # todo: Probable use of insecure hash functions in `hashlib`
@@ -106,7 +105,6 @@ ignore = [
106105
]
107106
"tests/**" = [
108107
"S101", # Use of `assert` detected
109-
"S105", "S106", # todo: Possible hardcoded password: ...
110108
"S301", # `pickle` and modules that wrap it can be unsafe when used to deserialize untrusted data, possible security issue
111109
"S113", # todo: Probable use of requests call without timeout
112110
"S311", # todo: Standard pseudo-random generators are not suitable for cryptographic purposes

requirements/fabric/examples.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

4-
torchvision >=0.16.0, <0.24.0
4+
torchvision >=0.16.0, <0.25.0
55
torchmetrics >=0.10.0, <1.9.0

requirements/pytorch/examples.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

44
requests <2.33.0
5-
torchvision >=0.16.0, <0.24.0
5+
torchvision >=0.16.0, <0.25.0
66
ipython[all] >=8.0.0, <10.0.0
77
torchmetrics >=0.10.0, <1.9.0

src/lightning/pytorch/callbacks/lr_monitor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def _extract_lr(self, param_group: dict[str, Any], name: str) -> dict[str, Any]:
241241
self.lrs[name].append(lr)
242242
return {name: lr}
243243

244-
def _remap_keys(self, names: list[list[str]], token: str = "/pg1") -> None:
244+
def _remap_keys(self, names: list[list[str]], token: str = "/pg1") -> None: # noqa: S107
245245
"""This function is used the remap the keys if param groups for a given optimizer increased."""
246246
for group_new_names in names:
247247
for new_name in group_new_names:

0 commit comments

Comments
 (0)