Merge branch 'master' into feat/add-support-for-fsdp2-strategy

Author: deependujha

.actions/assistant.py

@@ -459,6 +459,25 @@ def generate_docker_tags(
         tags = [f"{docker_project}:{tag}" for tag in tags]
         print(",".join(tags))
 
+    @staticmethod
+    def prune_pytest_as_errors(
+        pyproject_toml: str = "pyproject.toml", errors: tuple = ("FutureWarning", "DeprecationWarning")
+    ) -> None:
+        """Prune pytest warnings as errors from the pyproject.toml file."""
+        import tomlkit
+
+        with open(pyproject_toml, encoding="utf-8") as fopen:
+            content = fopen.read()
+        pyproject = tomlkit.parse(content)
+        filterwarnings = pyproject.get("tool", {}).get("pytest", {}).get("ini_options", {}).get("filterwarnings", [])
+        if not filterwarnings:
+            return
+        filterwarnings = [wrn for wrn in filterwarnings if not any(f"error::{err}" in wrn for err in errors)]
+        pyproject["tool"]["pytest"]["ini_options"]["filterwarnings"] = filterwarnings
+
+        with open(pyproject_toml, "w", encoding="utf-8") as fopen:
+            fopen.write(tomlkit.dumps(pyproject))
+
 
 if __name__ == "__main__":
     import jsonargparse

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

@@ -99,11 +99,14 @@ jobs:
       - name: Set min. dependencies
         if: ${{ matrix.config.requires == 'oldest' }}
         run: |
-          cd requirements/fabric
           uv pip install -U "lightning-utilities[cli]"
-          python -m lightning_utilities.cli requirements set-oldest --req_files "['base.txt', 'strategies.txt', 'test.txt']"
+          python -m lightning_utilities.cli requirements set-oldest \
+            --req_files "['requirements/fabric/base.txt', 'requirements/fabric/strategies.txt', 'requirements/fabric/test.txt']"
           uv pip install "cython<3.0" wheel
           uv pip install "pyyaml==5.4" --no-build-isolation
+          # This script removes any line containing "error::FutureWarning" from pyproject.toml
+          uv pip install -r requirements/ci.txt
+          python .actions/assistant.py prune_pytest_as_errors
 
       - name: Adjust PyTorch versions in requirements files
         if: ${{ matrix.config.requires != 'oldest' }}

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

@@ -98,11 +98,14 @@ jobs:
       - name: Set min. dependencies
         if: ${{ matrix.config.requires == 'oldest' }}
         run: |
-          cd requirements/pytorch
           uv pip install -U "lightning-utilities[cli]"
-          python -m lightning_utilities.cli requirements set-oldest --req_files "['base.txt', 'extra.txt', 'strategies.txt', 'examples.txt', 'test.txt']"
+          python -m lightning_utilities.cli requirements set-oldest \
+            --req_files "['requirements/pytorch/base.txt', 'requirements/pytorch/extra.txt', 'requirements/pytorch/strategies.txt', 'requirements/pytorch/examples.txt', 'requirements/pytorch/test.txt']"
           uv pip install "cython<3.0" wheel
           uv pip install "pyyaml==5.4" --no-build-isolation
+          # This script removes any line containing "error::FutureWarning" from pyproject.toml
+          uv pip install -r requirements/ci.txt
+          python .actions/assistant.py prune_pytest_as_errors
 
       - name: Adjust PyTorch versions in requirements files
         if: ${{ matrix.config.requires != 'oldest' }}

.github/workflows/code-checks.yml

@@ -29,23 +29,32 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.11"
 
-      - name: Mypy cache
-        uses: actions/cache@v4
+      - name: Install uv and set Python version
+        uses: astral-sh/setup-uv@v6
         with:
-          path: .mypy_cache
-          key: mypy-${{ hashFiles('requirements/typing.txt') }}
+          python-version: "3.11"
+          # TODO: Avoid activating environment like this
+          # see: https://github.com/astral-sh/setup-uv/tree/v6/?tab=readme-ov-file#activate-environment
+          activate-environment: true
+          enable-cache: true
 
       - name: Install dependencies
         env:
           FREEZE_REQUIREMENTS: 1
         timeout-minutes: 20
         run: |
-          pip install -e '.[pytorch-all,fabric-all]' -r requirements/typing.txt
-          pip list
+          uv pip install '.[pytorch-all,fabric-all]' -r requirements/typing.txt
+          uv pip list
+
+      - name: mypy cache
+        uses: actions/cache@v4
+        with:
+          path: .mypy_cache
+          key: mypy-${{ hashFiles('requirements/typing.txt') }}
 
       - name: Check typing
         run: mypy
+
+      - name: Minimize uv cache
+        run: uv cache prune --ci

pyproject.toml

@@ -182,7 +182,6 @@ filterwarnings = [
     # "error::DeprecationWarning",
     "error::FutureWarning",
     "ignore::FutureWarning:onnxscript", # Temporary ignore until onnxscript is updated
-    "ignore:The pynvml package is deprecated:FutureWarning", # Ignore pynvml deprecation warning, since it is not installed by PL directly
 ]
 xfail_strict = true
 junit_duration_report = "call"

requirements/ci.txt

@@ -1,8 +1,9 @@
 setuptools <80.9.1
 wheel <0.46.0
 awscli >=1.30.0, <1.43.0
-twine ==6.1.0
+twine ==6.2.0
 importlib-metadata <9.0.0
 wget
 pkginfo ==1.12.1.2
 packaging <25.1
+tomlkit

requirements/doctests.txt

@@ -1,2 +1,2 @@
-pytest ==8.4.1
+pytest ==8.4.2
 pytest-doctestplus ==1.4.0

requirements/fabric/base.txt

@@ -2,7 +2,7 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 torch >=2.1.0, <2.9.0
-fsspec[http] >=2022.5.0, <2025.8.0
+fsspec[http] >=2022.5.0, <2025.10.0
 packaging >=20.0, <=25.0
 typing-extensions >4.5.0, <4.16.0
 lightning-utilities >=0.10.0, <0.16.0

requirements/fabric/test.txt

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

requirements/pytorch/base.txt

@@ -4,7 +4,7 @@
 torch >=2.1.0, <2.9.0
 tqdm >=4.57.0, <4.68.0
 PyYAML >5.4, <6.1.0
-fsspec[http] >=2022.5.0, <2025.8.0
+fsspec[http] >=2022.5.0, <2025.10.0
 torchmetrics >0.7.0, <1.9.0
 packaging >=20.0, <=25.0
 typing-extensions >4.5.0, <4.16.0