Merge branch 'master' into fix/init_parsing

Author: SkafteNicki

.github/workflows/_legacy-checkpoints.yml

@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv and set Python version
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: "3.9"
           # TODO: Avoid activating environment like this

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

@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv and set Python version
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.config.python-version || '3.9' }}
           # TODO: Avoid activating environment like this

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

@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv and set Python version
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.config.python-version || '3.9' }}
           # TODO: Avoid activating environment like this

.github/workflows/code-checks.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv and set Python version
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: "3.11"
           # TODO: Avoid activating environment like this

.github/workflows/docs-build.yml

@@ -73,7 +73,7 @@ jobs:
           lfs: ${{ matrix.pkg-name == 'pytorch' }}
 
       - name: Install uv and set Python version
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: "3.10"
           # TODO: Avoid activating environment like this

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -70,7 +70,7 @@ repos:
       - id: sphinx-lint
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.13.3
     hooks:
       # try to fix what is possible
       - id: ruff
@@ -95,8 +95,8 @@ repos:
               README.md
           )$
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.1.0
+  - repo: https://github.com/JoC0de/pre-commit-prettier
+    rev: v3.6.2
     hooks:
       - id: prettier
         # https://prettier.io/docs/en/options.html#print-width

requirements/fabric/test.txt

@@ -1,9 +1,10 @@
-coverage ==7.10.6
+coverage ==7.10.7
 numpy >=1.21.0, <1.27.0
 pytest ==8.4.2
 pytest-cov ==6.3.0
 pytest-timeout ==2.4.0
-pytest-rerunfailures ==16.0.1
+pytest-rerunfailures ==16.0.1; python_version < "3.10"
+pytest-rerunfailures ==16.1; python_version >= "3.10"
 pytest-random-order ==1.2.0
 click ==8.1.8; python_version < "3.11"
 click ==8.3.0; python_version > "3.10"

requirements/pytorch/test.txt

@@ -1,8 +1,9 @@
-coverage ==7.10.6
+coverage ==7.10.7
 pytest ==8.4.2
 pytest-cov ==6.3.0
 pytest-timeout ==2.4.0
-pytest-rerunfailures ==16.0.1
+pytest-rerunfailures ==16.0.1; python_version < "3.10"
+pytest-rerunfailures ==16.1; python_version >= "3.10"
 pytest-random-order ==1.2.0
 
 # needed in tests

tests/tests_pytorch/graveyard/test_precision.py

@@ -3,10 +3,11 @@
 
 def test_precision_plugin_renamed_imports():
     # base class
+    from lightning.pytorch.plugins.precision.precision_plugin import PrecisionPlugin as PrecisionPlugin0
+
     from lightning.pytorch.plugins import PrecisionPlugin as PrecisionPlugin2
     from lightning.pytorch.plugins.precision import PrecisionPlugin as PrecisionPlugin1
     from lightning.pytorch.plugins.precision.precision import Precision
-    from lightning.pytorch.plugins.precision.precision_plugin import PrecisionPlugin as PrecisionPlugin0
 
     assert issubclass(PrecisionPlugin0, Precision)
     assert issubclass(PrecisionPlugin1, Precision)

tests/tests_pytorch/utilities/test_model_helpers.py

@@ -42,11 +42,12 @@ def test_is_overridden():
     reason="This test is ONLY relevant for the UNIFIED package",
 )
 def test_mixed_imports_unified():
-    from lightning.pytorch.utilities.compile import _maybe_unwrap_optimized as new_unwrap
-    from lightning.pytorch.utilities.model_helpers import is_overridden as new_is_overridden
     from pytorch_lightning.callbacks import EarlyStopping as OldEarlyStopping
     from pytorch_lightning.demos.boring_classes import BoringModel as OldBoringModel
 
+    from lightning.pytorch.utilities.compile import _maybe_unwrap_optimized as new_unwrap
+    from lightning.pytorch.utilities.model_helpers import is_overridden as new_is_overridden
+
     model = OldBoringModel()
     with pytest.raises(TypeError, match=r"`pytorch_lightning` object \(BoringModel\) to a `lightning.pytorch`"):
         new_unwrap(model)