Merge branch 'dev' into torch27

Signed-off-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com>

Author: ericspod

monai/networks/schedulers/ddpm.py

@@ -238,7 +238,7 @@ def step(
         pred_prev_sample = pred_original_sample_coeff * pred_original_sample + current_sample_coeff * sample
 
         # 6. Add noise
-        variance: int | torch.Tensor = 0
+        variance: torch.Tensor = torch.tensor(0)
         if timestep > 0:
             noise = torch.randn(
                 model_output.size(),

requirements-dev.txt

@@ -17,7 +17,7 @@ mccabe
 pep8-naming
 pycodestyle
 pyflakes
-black>=22.12
+black>=25.1.0
 isort>=5.1, <6.0
 ruff
 pytype>=2020.6.1, <=2024.4.11; platform_system != "Windows"

requirements-min.txt

@@ -1,7 +1,7 @@
 # Requirements for minimal tests
 -r requirements.txt
 setuptools>=50.3.0,<66.0.0,!=60.6.0 ; python_version < "3.12"
-setuptools>=70.2.0; python_version >= "3.12"
+setuptools>=70.2.0,<=79.0.1; python_version >= "3.12"
 coverage>=5.5
 parameterized
 packaging