fix: resolve pkg-resources deprecation issue (#21538)

Author: deependujha

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

@@ -130,6 +130,8 @@ jobs:
           uv pip install ".[${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" \
             --upgrade \
             --find-links="${TORCH_URL}"
+          # ensure pkg_resources is available for older python versions & packages like onnxruntime that require it
+          uv pip install "setuptools<80.10.3"
           uv pip list
 
       - name: Adjust tests

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

@@ -133,6 +133,8 @@ jobs:
             --upgrade \
             --find-links="${TORCH_URL}" \
             --find-links="https://download.pytorch.org/whl/torch-tensorrt"
+          # ensure pkg_resources is available for older python versions & packages like onnxruntime that require it
+          uv pip install "setuptools<80.10.3"
           uv pip list
 
       - name: Drop LAI from extensions

.lightning/workflows/fabric.yml

@@ -123,6 +123,9 @@ run: |
   extra=$(python -c "print({'lightning': 'fabric-'}.get('${PACKAGE_NAME}', ''))")
   uv pip install ".[${extra}dev]" --upgrade
 
+  # ensure pkg_resources is available for older python versions & packages like onnxruntime that require it
+  uv pip install "setuptools<80.10.3"
+
   python requirements/collect_env_details.py
   python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu >= 2, f'GPU: {mgpu}'"
   python -c "import bitsandbytes"

.lightning/workflows/pytorch.yml

@@ -137,6 +137,9 @@ run: |
     uv pip uninstall pytorch-lightning
   fi
 
+  # ensure pkg_resources is available for older python versions & packages like onnxruntime that require it
+  uv pip install "setuptools<80.10.3"
+
   python requirements/collect_env_details.py
   python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu >= 2, f'GPU: {mgpu}'"
   python requirements/pytorch/check-avail-extras.py

requirements/collect_env_details.py

@@ -20,8 +20,8 @@
 import os
 import platform
 import sys
+from importlib.metadata import distributions
 
-import pkg_resources
 import torch
 
 sys.path += [os.path.abspath(".."), os.path.abspath("")]
@@ -52,11 +52,7 @@ def info_cuda() -> dict:
 
 def info_packages() -> dict:
     """Get name and version of all installed packages."""
-    packages = {}
-    for dist in pkg_resources.working_set:
-        package = dist.as_requirement()
-        packages[package.key] = package.specs[0][1]
-    return packages
+    return {dist.metadata["Name"]: dist.version for dist in distributions()}
 
 
 def nice_print(details: dict, level: int = 0) -> list:

requirements/pytorch/test.txt

@@ -15,6 +15,7 @@ numpy >2.1.0, <2.4.2; python_version >= "3.12"
 onnx >1.12.0, <1.21.0
 onnxruntime >=1.12.0, <1.24.0
 onnxscript >= 0.1.0, < 0.6.0
+onnx-ir < 0.1.16
 psutil <7.3.0 # for `DeviceStatsMonitor`
 pandas >2.0, <2.4.0  # needed in benchmarks
 fastapi  # for `ServableModuleValidator`  # not setting version as re-defined in App

src/lightning_fabric/__setup__.py

@@ -5,7 +5,7 @@
 from types import ModuleType
 from typing import Any
 
-from pkg_resources import parse_requirements
+from packaging.requirements import Requirement
 from setuptools import find_packages
 
 _PROJECT_ROOT = "."
@@ -42,8 +42,13 @@ def _prepare_extras() -> dict[str, Any]:
         for p in req_files
         if p.name not in ("docs.txt", "base.txt")
     }
-    for req in parse_requirements(extras["strategies"]):
-        extras[req.key] = [str(req)]
+    for req_str in extras["strategies"]:
+        # Strip comments before parsing
+        req_str_clean = req_str.split("#")[0].strip()
+        if not req_str_clean:  # Skip empty lines
+            continue
+        req = Requirement(req_str_clean)
+        extras[req.name.lower().replace("-", "_")] = [req_str]
     extras["all"] = extras["extra"] + extras["strategies"] + extras["examples"]
     extras["dev"] = extras["all"] + extras["test"]
     return extras

src/pytorch_lightning/__setup__.py

@@ -5,7 +5,7 @@
 from types import ModuleType
 from typing import Any
 
-from pkg_resources import parse_requirements
+from packaging.requirements import Requirement
 from setuptools import find_packages
 
 _PROJECT_ROOT = "."
@@ -42,8 +42,13 @@ def _prepare_extras() -> dict[str, Any]:
         for p in req_files
         if p.name not in ("docs.txt", "base.txt")
     }
-    for req in parse_requirements(extras["strategies"]):
-        extras[req.key] = [str(req)]
+    for req_str in extras["strategies"]:
+        # Strip comments before parsing
+        req_str_clean = req_str.split("#")[0].strip()
+        if not req_str_clean:  # Skip empty lines
+            continue
+        req = Requirement(req_str_clean)
+        extras[req.name.lower().replace("-", "_")] = [req_str]
     extras["all"] = extras["extra"] + extras["strategies"] + extras["examples"]
     extras["dev"] = extras["all"] + extras["test"]  # + extras['docs']
     return extras