Skip to content

Commit 1aaeb5a

Browse files
authored
Merge branch 'master' into dependabot-pip-requirements-pytest-8.4.2
2 parents 4d7d4ca + 44e57d0 commit 1aaeb5a

File tree

7 files changed

+7
-4
lines changed

7 files changed

+7
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/"
6767
# TODO: Remove this - Enable running MPS tests on this platform
6868
DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
69+
UV_TORCH_BACKEND: "cpu"
6970
steps:
7071
- uses: actions/checkout@v5
7172

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
7272
# TODO: Remove this - Enable running MPS tests on this platform
7373
DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
74+
UV_TORCH_BACKEND: "cpu"
7475
steps:
7576
- uses: actions/checkout@v5
7677

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ filterwarnings = [
182182
# "error::DeprecationWarning",
183183
"error::FutureWarning",
184184
"ignore::FutureWarning:onnxscript", # Temporary ignore until onnxscript is updated
185+
"ignore:The pynvml package is deprecated:FutureWarning", # Ignore pynvml deprecation warning, since it is not installed by PL directly
185186
]
186187
xfail_strict = true
187188
junit_duration_report = "call"

requirements/ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
setuptools <80.9.1
22
wheel <0.46.0
33
awscli >=1.30.0, <1.43.0
4-
twine ==6.1.0
4+
twine ==6.2.0
55
importlib-metadata <9.0.0
66
wget
77
pkginfo ==1.12.1.2

requirements/fabric/base.txt

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

44
torch >=2.1.0, <2.9.0
5-
fsspec[http] >=2022.5.0, <2025.8.0
5+
fsspec[http] >=2022.5.0, <2025.10.0
66
packaging >=20.0, <=25.0
77
typing-extensions >4.5.0, <4.16.0
88
lightning-utilities >=0.10.0, <0.16.0

requirements/pytorch/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
torch >=2.1.0, <2.9.0
55
tqdm >=4.57.0, <4.68.0
66
PyYAML >5.4, <6.1.0
7-
fsspec[http] >=2022.5.0, <2025.8.0
7+
fsspec[http] >=2022.5.0, <2025.10.0
88
torchmetrics >0.7.0, <1.9.0
99
packaging >=20.0, <=25.0
1010
typing-extensions >4.5.0, <4.16.0

requirements/pytorch/extra.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
matplotlib>3.1, <3.11.0
66
omegaconf >=2.2.3, <2.4.0
77
hydra-core >=1.2.0, <1.4.0
8-
jsonargparse[signatures,jsonnet] >=4.39.0, <4.41.0
8+
jsonargparse[signatures,jsonnet] >=4.39.0, <4.42.0
99
rich >=12.3.0, <14.2.0
1010
tensorboardX >=2.2, <2.7.0 # min version is set by torch.onnx missing attribute
1111
bitsandbytes >=0.45.2,<0.47.0; platform_system != "Darwin"

0 commit comments

Comments
 (0)