Skip to content

Commit 44f43cb

Browse files
authored
Merge branch 'master' into update/code-owners
2 parents c4b55f0 + 3abe314 commit 44f43cb

File tree

10 files changed

+13
-8
lines changed

10 files changed

+13
-8
lines changed

.github/workflows/_legacy-checkpoints.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959

6060
- name: Install uv and set Python version
61-
uses: astral-sh/setup-uv@v6
61+
uses: astral-sh/setup-uv@v7
6262
with:
6363
python-version: "3.9"
6464
# TODO: Avoid activating environment like this

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- uses: actions/checkout@v5
7272

7373
- name: Install uv and set Python version
74-
uses: astral-sh/setup-uv@v6
74+
uses: astral-sh/setup-uv@v7
7575
with:
7676
python-version: ${{ matrix.config.python-version || '3.9' }}
7777
# TODO: Avoid activating environment like this

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- uses: actions/checkout@v5
7777

7878
- name: Install uv and set Python version
79-
uses: astral-sh/setup-uv@v6
79+
uses: astral-sh/setup-uv@v7
8080
with:
8181
python-version: ${{ matrix.config.python-version || '3.9' }}
8282
# TODO: Avoid activating environment like this

.github/workflows/code-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v5
3232

3333
- name: Install uv and set Python version
34-
uses: astral-sh/setup-uv@v6
34+
uses: astral-sh/setup-uv@v7
3535
with:
3636
python-version: "3.11"
3737
# TODO: Avoid activating environment like this

.github/workflows/docs-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
lfs: ${{ matrix.pkg-name == 'pytorch' }}
7474

7575
- name: Install uv and set Python version
76-
uses: astral-sh/setup-uv@v6
76+
uses: astral-sh/setup-uv@v7
7777
with:
7878
python-version: "3.10"
7979
# TODO: Avoid activating environment like this

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<br/>
66
<br/>
77

8-
**The deep learning framework to pretrai and finetune AI models.**
8+
**The deep learning framework to pretrain and finetune AI models.**
99

1010
**Deploying models?** Check out [LitServe](https://github.com/Lightning-AI/litserve?utm_source=ptl_readme&utm_medium=referral&utm_campaign=ptl_readme), the PyTorch Lightning for inference engines
1111

docs/source-fabric/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@
272272

273273
nitpick_ignore_regex = [
274274
("py:class", "typing.Self"),
275+
("py:data", "typing.Union"),
275276
# these are not generated with docs API ref
276277
("py:class", "lightning.fabric.utilities.types.Optimizable"),
277278
("py:class", "lightning.fabric.utilities.types.Steppable"),

docs/source-pytorch/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ def _load_py_module(name: str, location: str) -> ModuleType:
374374

375375
nitpick_ignore = [
376376
("py:class", "typing.Self"),
377+
("py:data", "typing.Union"),
377378
# missing in generated API
378379
("py:exc", "MisconfigurationException"),
379380
# TODO: generated list of all existing ATM, need to be fixed
@@ -648,6 +649,7 @@ def package_list_from_file(file):
648649
"https://medium.com/pytorch-lightning/quick-contribution-guide-86d977171b3a",
649650
"https://deepgenerativemodels.github.io/assets/slides/cs236_lecture11.pdf",
650651
"https://developer.habana.ai", # returns 403 error but redirects to intel.com documentation
652+
"https://www.supermicro.com", # returns 403 error
651653
"https://www.intel.com/content/www/us/en/products/docs/processors/what-is-a-gpu.html",
652654
"https://www.microsoft.com/en-us/research/blog/zero-infinity-and-deepspeed-unlocking-unprecedented-model-scale-for-deep-learning-training/", # noqa: E501
653655
"https://stackoverflow.com/questions/66640705/how-can-i-install-grpcio-on-an-apple-m1-silicon-laptop",

requirements/fabric/test.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ numpy >=1.21.0, <1.27.0
33
pytest ==8.4.2
44
pytest-cov ==6.3.0
55
pytest-timeout ==2.4.0
6-
pytest-rerunfailures ==16.0.1
6+
pytest-rerunfailures ==16.0.1; python_version < "3.10"
7+
pytest-rerunfailures ==16.1; python_version >= "3.10"
78
pytest-random-order ==1.2.0
89
click ==8.1.8; python_version < "3.11"
910
click ==8.3.0; python_version > "3.10"

requirements/pytorch/test.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ coverage ==7.10.6
22
pytest ==8.4.2
33
pytest-cov ==6.3.0
44
pytest-timeout ==2.4.0
5-
pytest-rerunfailures ==16.0.1
5+
pytest-rerunfailures ==16.0.1; python_version < "3.10"
6+
pytest-rerunfailures ==16.1; python_version >= "3.10"
67
pytest-random-order ==1.2.0
78

89
# needed in tests

0 commit comments

Comments
 (0)