Merge pull request #1775 from helmholtz-analytics/support/new-pytorch…

…-main

Support PyTorch 2.6.0 / Add zarr as optional dependency

.github/workflows/ci.yaml

@@ -17,14 +17,15 @@ jobs:
           - 3.11
           - 3.12
         mpi: [ 'openmpi' ]
-        install-options: [ '.', '.[hdf5,netcdf,pandas]' ]
+        install-options: [ '.', '.[hdf5,netcdf,pandas,zarr]' ]
         pytorch-version:
           - 'torch==2.0.1 torchvision==0.15.2 torchaudio==2.0.2'
           - 'torch==2.1.2 torchvision==0.16.2 torchaudio==2.1.2'
           - 'torch==2.2.2 torchvision==0.17.2 torchaudio==2.2.2'
           - 'torch==2.3.1 torchvision==0.18.1 torchaudio==2.3.1'
           - 'torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1'
           - 'torch==2.5.1 torchvision==0.20.1 torchaudio==2.5.1'
+          - 'torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0'
         exclude:
           - py-version: '3.12'
             pytorch-version: 'torch==2.0.1 torchvision==0.15.2 torchaudio==2.0.2'

setup.py

@@ -35,10 +35,10 @@
     install_requires=[
         "mpi4py>=3.0.0",
         "numpy>=1.22.0, <2",
-        "torch>=2.0.0, <2.5.2",
+        "torch>=2.0.0, <2.6.1",
         "scipy>=1.10.0",
         "pillow>=6.0.0",
-        "torchvision>=0.15.2, <0.20.2",
+        "torchvision>=0.15.2, <0.21.1",
     ],
     extras_require={
         "docutils": ["docutils>=0.16"],
@@ -48,5 +48,6 @@
         "examples": ["scikit-learn>=0.24.0", "matplotlib>=3.1.0"],
         "cb": ["perun>=0.2.0"],
         "pandas": ["pandas>=1.4"],
+        "zarr": ["zarr"],
     },
 )