Merge branch 'Lightning-AI:master' into update-pyproject-py310

Author: matsumotosan

.actions/assistant.py

@@ -46,14 +46,14 @@
 
 
 class _RequirementWithComment(Requirement):
-    strict_string = "# strict"
+    strict_cmd = "strict"
 
     def __init__(self, *args: Any, comment: str = "", pip_argument: str | None = None, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         self.comment = comment
         assert pip_argument is None or pip_argument  # sanity check that it's not an empty str
         self.pip_argument = pip_argument
-        self.strict = self.strict_string in comment.lower()
+        self.strict = self.strict_cmd in comment.lower()
 
     def adjust(self, unfreeze: str) -> str:
         """Remove version restrictions unless they are strict.
@@ -62,25 +62,26 @@ def adjust(self, unfreeze: str) -> str:
         'arrow<=1.2.2,>=1.2.0'
         >>> _RequirementWithComment("arrow<=1.2.2,>=1.2.0", comment="# strict").adjust("none")
         'arrow<=1.2.2,>=1.2.0  # strict'
-        >>> _RequirementWithComment("arrow<=1.2.2,>=1.2.0", comment="# my name").adjust("all")
-        'arrow>=1.2.0'
+        >>> _RequirementWithComment('arrow<=1.2.2,>=1.2.0; python_version >= "3.10"', comment="# my name").adjust("all")
+        'arrow>=1.2.0; python_version >= "3.10"'
         >>> _RequirementWithComment("arrow>=1.2.0, <=1.2.2", comment="# strict").adjust("all")
         'arrow<=1.2.2,>=1.2.0  # strict'
-        >>> _RequirementWithComment("arrow").adjust("all")
-        'arrow'
+        >>> _RequirementWithComment('arrow; python_version >= "3.10"').adjust("all")
+        'arrow; python_version >= "3.10"'
         >>> _RequirementWithComment("arrow>=1.2.0, <=1.2.2", comment="# cool").adjust("major")
         'arrow<2.0,>=1.2.0'
         >>> _RequirementWithComment("arrow>=1.2.0, <=1.2.2", comment="# strict").adjust("major")
         'arrow<=1.2.2,>=1.2.0  # strict'
-        >>> _RequirementWithComment("arrow>=1.2.0").adjust("major")
-        'arrow>=1.2.0'
+        >>> _RequirementWithComment('arrow>=1.2.0; python_version >= "3.10"').adjust("major")
+        'arrow>=1.2.0; python_version >= "3.10"'
         >>> _RequirementWithComment("arrow").adjust("major")
         'arrow'
 
         """
         out = str(self)
         if self.strict:
-            return f"{out}  {self.strict_string}"
+            return f"{out}  # {self.strict_cmd}"
+
         specs = [(spec.operator, spec.version) for spec in self.specifier]
         if unfreeze == "major":
             for operator, version in specs:

.github/workflows/_legacy-checkpoints.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           # 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

.github/workflows/ci-pkg-install.yml

@@ -44,7 +44,7 @@ jobs:
       matrix:
         os: ["ubuntu-22.04", "macOS-14", "windows-2022"]
         pkg-name: ["fabric", "pytorch", "lightning", "notset"]
-        python-version: ["3.9", "3.11"]
+        python-version: ["3.10", "3.11"]
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6

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

@@ -73,7 +73,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: ${{ matrix.config.python-version || '3.9' }}
+          python-version: ${{ matrix.config.python-version || '3.10' }}
           # 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

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

@@ -78,7 +78,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: ${{ matrix.config.python-version || '3.9' }}
+          python-version: ${{ matrix.config.python-version || '3.10' }}
           # 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

.github/workflows/release-nightly.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Convert actual version to nightly
         run: |

.github/workflows/release-pkg.yml

@@ -24,7 +24,7 @@ defaults:
 env:
   FREEZE_REQUIREMENTS: 1
   TORCH_URL: "https://download.pytorch.org/whl/cpu/"
-  PYTHON_VER: "3.9"
+  PYTHON_VER: "3.10"
 
 jobs:
   build-packages:

.readthedocs.yml

@@ -31,7 +31,7 @@ sphinx:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.9"
+    python: "3.10"
   apt_packages:
     - texlive-latex-extra
     - dvipng

requirements/pytorch/test.txt

@@ -14,7 +14,7 @@ numpy >1.20.0, <1.27.0
 onnx >1.12.0, <1.20.0
 onnxruntime >=1.12.0, <1.24.0
 onnxscript >= 0.1.0, < 0.6.0
-psutil <7.1.2 # for `DeviceStatsMonitor`
+psutil <7.2.0 # for `DeviceStatsMonitor`
 pandas >2.0, <2.4.0  # needed in benchmarks
 fastapi  # for `ServableModuleValidator`  # not setting version as re-defined in App
 uvicorn  # for `ServableModuleValidator`  # not setting version as re-defined in App

tests/legacy/generate_checkpoints.sh

@@ -36,7 +36,6 @@ do
   source $ENV_PATH/bin/activate
 
   uv pip install "pytorch_lightning==$pl_ver" \
-    -r $LEGACY_FOLDER/requirements.txt \
     -r "$(dirname $TESTS_FOLDER)/requirements/pytorch/test.txt" \
     -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
@@ -52,7 +51,6 @@ if [[ -z "$@" ]]; then
   printf "\n\n processing local version\n"
 
   uv pip install \
-    -r $LEGACY_FOLDER/requirements.txt \
     -r "$(dirname $TESTS_FOLDER)/requirements/pytorch/test.txt" \
     -f https://download.pytorch.org/whl/cpu/torch_stable.html
   pl_ver="local"