Skip to content

Commit 8b69285

Browse files
awaelchliEtayLivneEtay Livnedependabot[bot]tchaton
authored
Patch release 2.3.1 (#20021)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Etay Livne <[email protected]> Co-authored-by: Etay Livne <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: thomas chaton <[email protected]>
1 parent a42484c commit 8b69285

Some content is hidden

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

50 files changed

+757
-445
lines changed

.github/checkgroup.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ subprojects:
242242
- "!*.md"
243243
- "!**/*.md"
244244
checks:
245-
- "app-pytest (macOS-11, lightning, 3.8, latest)"
246-
- "app-pytest (macOS-11, lightning, 3.8, oldest)"
247-
- "app-pytest (macOS-11, app, 3.9, latest)"
245+
- "app-pytest (macOS-12, lightning, 3.8, latest)"
246+
- "app-pytest (macOS-12, lightning, 3.8, oldest)"
247+
- "app-pytest (macOS-12, app, 3.9, latest)"
248248
- "app-pytest (macOS-12, app, 3.11, latest)"
249249
- "app-pytest (ubuntu-20.04, lightning, 3.8, latest)"
250250
- "app-pytest (ubuntu-20.04, lightning, 3.8, oldest)"
@@ -270,9 +270,9 @@ subprojects:
270270
- "!*.md"
271271
- "!**/*.md"
272272
checks:
273-
- "app-examples (macOS-11, lightning, 3.9, latest)"
274-
- "app-examples (macOS-11, lightning, 3.9, oldest)"
275-
- "app-examples (macOS-11, app, 3.9, latest)"
273+
- "app-examples (macOS-12, lightning, 3.9, latest)"
274+
- "app-examples (macOS-12, lightning, 3.9, oldest)"
275+
- "app-examples (macOS-12, app, 3.9, latest)"
276276
- "app-examples (ubuntu-20.04, lightning, 3.9, latest)"
277277
- "app-examples (ubuntu-20.04, lightning, 3.9, oldest)"
278278
- "app-examples (ubuntu-20.04, app, 3.9, latest)"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-20.04, macOS-11, windows-2022]
39+
os: [ubuntu-20.04, macOS-12, windows-2022]
4040
pkg-name: ["lightning"]
4141
python-version: ["3.9"]
4242
requires: ["oldest", "latest"]
4343
include:
4444
# "app" installs the standalone package
45-
- { os: "macOS-11", pkg-name: "app", python-version: "3.9", requires: "latest" }
45+
- { os: "macOS-12", pkg-name: "app", python-version: "3.9", requires: "latest" }
4646
- { os: "ubuntu-20.04", pkg-name: "app", python-version: "3.9", requires: "latest" }
4747
- { os: "windows-2022", pkg-name: "app", python-version: "3.9", requires: "latest" }
4848
# Timeout: https://stackoverflow.com/a/59076067/4521646

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
os: ["ubuntu-20.04", "macOS-11", "windows-2022"]
41+
os: ["ubuntu-20.04", "macOS-12", "windows-2022"]
4242
pkg-name: ["lightning"]
4343
python-version: ["3.8"]
4444
requires: ["oldest", "latest"]
@@ -48,7 +48,7 @@ jobs:
4848
- { os: "ubuntu-22.04", pkg-name: "app", python-version: "3.11", requires: "latest" }
4949
- { os: "windows-2022", pkg-name: "app", python-version: "3.11", requires: "latest" }
5050
# "app" installs the standalone package
51-
- { os: "macOS-11", pkg-name: "app", python-version: "3.9", requires: "latest" }
51+
- { os: "macOS-12", pkg-name: "app", python-version: "3.9", requires: "latest" }
5252
- { os: "ubuntu-20.04", pkg-name: "app", python-version: "3.9", requires: "latest" }
5353
- { os: "windows-2022", pkg-name: "app", python-version: "3.8", requires: "latest" }
5454
# Timeout: https://stackoverflow.com/a/59076067/4521646

.github/workflows/docker-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
gh_env.write("DOCKER_TAGS=" + ",".join(tags))
8484
shell: python
8585

86-
- uses: docker/build-push-action@v5
86+
- uses: docker/build-push-action@v6
8787
with:
8888
build-args: |
8989
PYTHON_VERSION=${{ matrix.python_version }}
@@ -119,7 +119,7 @@ jobs:
119119
with:
120120
username: ${{ secrets.DOCKER_USERNAME }}
121121
password: ${{ secrets.DOCKER_PASSWORD }}
122-
- uses: docker/build-push-action@v5
122+
- uses: docker/build-push-action@v6
123123
with:
124124
build-args: |
125125
PYTHON_VERSION=${{ matrix.python_version }}
@@ -151,7 +151,7 @@ jobs:
151151
- name: Build Conda Docker
152152
# publish master/release
153153
continue-on-error: true
154-
uses: docker/build-push-action@v5
154+
uses: docker/build-push-action@v6
155155
with:
156156
file: dockers/nvidia/Dockerfile
157157
push: false

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ exclude = [
140140
"src/lightning/app/cli/component-template",
141141
"src/lightning/app/cli/pl-app-template",
142142
"src/lightning/app/cli/react-ui-template",
143+
"src/lightning/app/launcher/utils.py",
143144
]
144145
install_types = "True"
145146
non_interactive = "True"

requirements/app/app.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
lightning-cloud == 0.5.69 # Must be pinned to ensure compatibility
1+
lightning-cloud == 0.5.70 # Must be pinned to ensure compatibility
22
packaging
33
typing-extensions >=4.4.0, <4.10.0
44
deepdiff >=5.7.0, <6.6.0
55
fsspec[http] >=2022.5.0, <2023.11.0
66
croniter >=1.3.0, <1.5.0 # strict; TODO: for now until we find something more robust.
77
traitlets >=5.3.0, <5.12.0
88
arrow >=1.2.0, <1.3.0
9-
lightning-utilities >=0.8.0, <0.12.0
9+
lightning-utilities >=0.10.0, <0.12.0
1010
beautifulsoup4 >=4.8.0, <4.13.0
1111
inquirer >=2.10.0, <3.2.0
1212
psutil <5.9.6
@@ -27,3 +27,5 @@ urllib3 <2.0.0
2727
uvicorn <0.24.0
2828
websocket-client <1.7.0
2929
websockets <11.1.0
30+
numpy >=1.17.2, <2.0
31+
msgpack

requirements/ci.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
setuptools
2-
wheel
1+
setuptools <70.1.1
2+
wheel <0.44.0
33
awscli >=1.30.0, <1.31.0
44
twine ==4.0.1
5+
importlib-metadata <8.0.0
56
wget
6-
packaging
7+
packaging <24.2

requirements/fabric/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ torch >=2.0.0, <2.4.0
66
fsspec[http] >=2022.5.0, <2024.4.0
77
packaging >=20.0, <=23.1
88
typing-extensions >=4.4.0, <4.10.0
9-
lightning-utilities >=0.8.0, <0.12.0
9+
lightning-utilities >=0.10.0, <0.12.0

requirements/pytorch/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ fsspec[http] >=2022.5.0, <2024.4.0
99
torchmetrics >=0.7.0, <1.3.0 # needed for using fixed compare_version
1010
packaging >=20.0, <=23.1
1111
typing-extensions >=4.4.0, <4.10.0
12-
lightning-utilities >=0.8.0, <0.12.0
12+
lightning-utilities >=0.10.0, <0.12.0

requirements/pytorch/extra.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
# extended list of package dependencies to reach full functionality
55
matplotlib>3.1, <3.9.0
6-
omegaconf >=2.0.5, <2.4.0
7-
hydra-core >=1.0.5, <1.4.0
6+
omegaconf >=2.2.3, <2.4.0
7+
hydra-core >=1.2.0, <1.4.0
88
jsonargparse[signatures] >=4.27.7, <4.28.0
99
rich >=12.3.0, <13.6.0
1010
tensorboardX >=2.2, <2.7.0 # min version is set by torch.onnx missing attribute

0 commit comments

Comments
 (0)