Merge pull request #389 from IBM/consolidate_reqs

consolidate requirements
IBM · Jan 30, 2025 · 25fa6fe · 25fa6fe
2 parents 89b913d + b18f6f2
commit 25fa6fe
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 80 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -29,8 +29,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           #pip install -r requirements/required.txt -r requirements/test.txt -r requirements/optional.txt
-          pip install -r requirements/test.txt -r requirements/optional.txt
-          pip install -e .[torchgeo]
+          #pip install -r requirements/test.txt -r requirements/optional.txt
+          pip install -e .[torchgeo,test]
           pip install git+https://github.com/NASA-IMPACT/Prithvi-WxC.git
           pip install git+https://github.com/IBM/granite-wxc.git
       - name: List pip dependencies

diff --git a/pyproject.toml b/pyproject.toml
@@ -29,42 +29,28 @@ classifiers = [
 ]
 
 dependencies = [
-  "torch>=2.1.0, <=2.5.0",
-  "torchvision>=0.16.0",
-  "torchgeo>=0.6.0",
-  "rioxarray>=0.15.0",
-  # see issue #64
-  "albumentations>=1.3.1, <=1.4.21",
-  "albucore<=0.0.16",
-  "rasterio>=1.3.9",
-  "torchmetrics<=1.3.1",
-  "geopandas>=0.14.4",
-  "lightly>=1.4.25",
-  "h5py>=3.10.0",
-  "mlflow>=2.12.1",
-  # broken due to https://github.com/Lightning-AI/pytorch-lightning/issues/19977
-  "lightning[pytorch-extra]>=2,!=2.3.*",
-  "segmentation-models-pytorch>=0.3",
-  "jsonargparse<=4.35.0",
-  # Dependencies not available on PyPI
+  "torch",
+  "torchvision",
+  "rioxarray",
+  "albumentations==1.4.10",
+  "albucore==0.0.16",
+  "rasterio",
+  "torchmetrics",
+  "geopandas",
+  "lightly",
+  "jsonargparse==4.32.0",
+  "h5py",
+  "mlflow",
+  "lightning",
+  "segmentation-models-pytorch",
+  "jsonargparse",
+  "pytest",
 ]
 
 [project.optional-dependencies]
 torchgeo = [
-  "torch==2.4.1",
-  "torchvision==0.19.1",
-  "torchgeo @ git+https://github.com/microsoft/torchgeo.git@fedf99375535f801565856cd774bfa9e5a251d55",
-  "rioxarray>=0.15.0",
-  "albumentations==1.3.1",
-  "albucore<=0.0.16",
-  "rasterio>=1.3.9",
-  "torchmetrics<=1.3.1",
-  "geopandas>=0.14.4",
-  "lightly>=1.4.25",
-  "h5py>=3.10.0",
-  "mlflow>=2.12.1",
-  "lightning[pytorch-extra]>=2,!=2.3.*",
-  "segmentation-models-pytorch>=0.3"
+  #"torchgeo @ git+https://github.com/microsoft/torchgeo.git@fedf99375535f801565856cd774bfa9e5a251d55",
+  "torchgeo"
 ]
 
 dev = [

diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/optional.txt b/requirements/optional.txt
diff --git a/requirements/required.txt b/requirements/required.txt
diff --git a/requirements/test.txt b/requirements/test.txt