From 3e8f73973ce85c53270a079509b9708a7e918f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lucas=20de=20Sousa=20Almeida?= Date: Mon, 13 Jan 2025 09:39:58 -0300 Subject: [PATCH 1/4] Testing the repository using the installation from pyproject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Lucas de Sousa Almeida --- .github/workflows/test.yaml | 3 ++- pyproject.toml | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5b522c26..10ad4df9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,8 @@ jobs: - name: Install dependencies 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/required.txt -r requirements/test.txt -r requirements/optional.txt + pip install -e .[torchgeo] 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 index 6a477ac4..28a5130e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "torchgeo>=0.6.0", "rioxarray>=0.15.0", # see issue #64 - "albumentations>=1.3.1, <=1.4.10", + "albumentations>=1.3.1, <=1.4.21", "albucore<=0.0.16", "rasterio>=1.3.9", "torchmetrics<=1.3.1", @@ -49,6 +49,23 @@ dependencies = [ ] [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, <=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", + "lightning[pytorch-extra]>=2,!=2.3.*", + "segmentation-models-pytorch>=0.3" +] + dev = [ "black", "mkdocs-material", From ea77654d3e685bcd58b678069ecee1c4d2c76c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lucas=20de=20Sousa=20Almeida?= Date: Mon, 13 Jan 2025 09:59:37 -0300 Subject: [PATCH 2/4] Additional dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Lucas de Sousa Almeida --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 10ad4df9..cc2fc6c4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,6 +29,7 @@ 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 git+https://github.com/NASA-IMPACT/Prithvi-WxC.git pip install git+https://github.com/IBM/granite-wxc.git From 9a286f20190016852bf6fdd864f156c4f9c48dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lucas=20de=20Sousa=20Almeida?= Date: Mon, 13 Jan 2025 10:53:11 -0300 Subject: [PATCH 3/4] pinning albumentations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Lucas de Sousa Almeida --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 28a5130e..1d0c5645 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ torchgeo = [ "torchvision==0.19.1", "torchgeo @ git+https://github.com/microsoft/torchgeo.git@fedf99375535f801565856cd774bfa9e5a251d55", "rioxarray>=0.15.0", - "albumentations>=1.3.1, <=1.4.21", + "albumentations==1.3.1", "albucore<=0.0.16", "rasterio>=1.3.9", "torchmetrics<=1.3.1", From f802ab1d3e028c50a15c082c316d3dc3c55c2e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lucas=20de=20Sousa=20Almeida?= Date: Wed, 22 Jan 2025 14:47:18 -0300 Subject: [PATCH 4/4] pinning jsonargparse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Lucas de Sousa Almeida --- mkdocs.yml | 6 +++--- pyproject.toml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 3105bbf0..0ffd9b8b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -15,9 +15,9 @@ plugins: paths: [src] # search packages in the src folde options: show_root_heading: true -extra: - version: - provider: mike + #extra: + # version: + # provider: mike site_url: https://ibm.github.io/terratorch/ repo_url: https://github.com/IBM/terratorch diff --git a/pyproject.toml b/pyproject.toml index 1d0c5645..30d3cc0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,8 @@ dependencies = [ "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" + "segmentation-models-pytorch>=0.3", + "jsonargparse<=4.35.0", # Dependencies not available on PyPI ]