Merge branch 'master' into numpy_scalars

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

pyproject.toml

@@ -174,6 +174,8 @@ filterwarnings = [
     "ignore::FutureWarning:onnxscript", # Temporary ignore until onnxscript is updated
     "ignore:You are using `torch.load` with `weights_only=False`.*:FutureWarning",
     "ignore::FutureWarning:torch.distributed.algorithms.ddp_comm_hooks",
+    # PyTorch pytree LeafSpec deprecation triggered during doctest
+    "ignore:`isinstance\\(treespec, LeafSpec\\)` is deprecated.*:FutureWarning",
 ]
 xfail_strict = true
 junit_duration_report = "call"

requirements/ci.txt

@@ -1,4 +1,4 @@
-setuptools <80.9.1
+setuptools <80.10.3
 wheel <0.46.0
 awscli >=1.30.0, <1.45.0
 twine ==6.2.0

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/fabric/examples.txt

@@ -1,5 +1,5 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
-torchvision >=0.16.0, <0.25.0
+torchvision >=0.16.0, <0.26.0
 torchmetrics >=0.10.0, <1.9.0

requirements/pytorch/examples.txt

@@ -2,6 +2,6 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 requests <2.33.0
-torchvision >=0.16.0, <0.25.0
+torchvision >=0.16.0, <0.26.0
 ipython[all] >=8.0.0, <10.0.0
 torchmetrics >=0.10.0, <1.9.0

requirements/pytorch/loggers.info

@@ -1,6 +1,6 @@
 # all supported loggers. this list is here as a reference, but they are not installed in CI
 
-litlogger >= 0.1.2
+litlogger >= 0.1.7
 neptune >=1.0.0
 comet-ml >=3.31.0
 mlflow >=1.0.0