From e44d92f3fff64dfa760ff82dccf32b1b90a5458e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 1 Apr 2023 10:53:41 -0500 Subject: [PATCH 1/4] Deps: make omegaconf/tensorboard optional --- environment.yml | 1 + requirements/min-reqs.old | 3 ++- requirements/required.txt | 3 +-- requirements/tests.txt | 2 ++ setup.cfg | 8 +++++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/environment.yml b/environment.yml index ec68b557d7c..f70bcd7242c 100644 --- a/environment.yml +++ b/environment.yml @@ -46,6 +46,7 @@ dependencies: - segmentation-models-pytorch>=0.2 - setuptools>=42 - sphinx>=4,<6 + - tensorboard>=1.6 - timm>=0.4.12 - torchmetrics>=0.10 - zipfile-deflate64>=0.2 diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 0b81d17f8f5..3ce6fc0e17a 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -8,7 +8,6 @@ kornia==0.6.5 lightning==1.8.0 matplotlib==3.3.0 numpy==1.17.3 -omegaconf==2.1.0 pillow==6.2.1 pyproj==2.4.1 rasterio==1.1.1 @@ -49,5 +48,7 @@ pyupgrade==2.4.0 # tests mypy==0.900 nbmake==1.3.3 +omegaconf==2.1.0 pytest==6.1.2 pytest-cov==2.4.0 +tensorboard==1.6.0 diff --git a/requirements/required.txt b/requirements/required.txt index ebe4db5345f..62e9195a6a9 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -5,10 +5,9 @@ setuptools==67.6.0 einops==0.6.0 fiona==1.9.2 kornia==0.6.11 -lightning[extra]==2.0.1 +lightning==2.0.1 matplotlib==3.7.1 numpy==1.24.2 -omegaconf==2.3.0 pillow==9.5.0 pyproj==3.5.0 rasterio==1.3.6 diff --git a/requirements/tests.txt b/requirements/tests.txt index 1a19f8a0569..c76830a2fc1 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,5 +1,7 @@ # tests mypy==1.1.1 nbmake==1.4.1 +omegaconf==2.3.0 pytest==7.2.2 pytest-cov==4.0.0 +tensorboard==2.12.1 diff --git a/setup.cfg b/setup.cfg index c5002237436..09a018c160c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,13 +31,11 @@ install_requires = # kornia 0.6.5+ required due to change in kornia.augmentation API kornia>=0.6.5,<0.7 # lightning 1.8+ is first release - lightning[extra]>=1.8,<2 + lightning>=1.8,<2 # matplotlib 3.3+ required for (H, W, 1) image support in plt.imshow matplotlib>=3.3,<4 # numpy 1.17.3+ required by Python 3.8 wheels numpy>=1.17.3,<2 - # omegaconf 2.1+ required for to_object method - omegaconf>=2.1,<3 # pillow 6.2.1+ required for Python 3.8 wheels pillow>=6.2.1,<10 # pyproj 2.4.1+ required for Python 3.8 wheels @@ -123,10 +121,14 @@ tests = mypy>=0.900,<2 # nbmake 1.3.3+ required for variable mocking nbmake>=1.3.3,<2 + # omegaconf 2.1+ required for to_object method + omegaconf>=2.1,<3 # pytest 6.1.2+ required by nbmake pytest>=6.1.2,<8 # pytest-cov 2.4+ required for pytest --cov flags pytest-cov>=2.4,<5 + # tensorboard 1.6+ is first release + tensorboard>=1.6,<3 all = torchgeo[datasets,docs,style,tests] From 0a7a8a7dbfd08174ec0213751419863ce8c6a2b2 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 1 Apr 2023 11:47:19 -0500 Subject: [PATCH 2/4] Bump minimum tensorboard --- environment.yml | 2 +- requirements/min-reqs.old | 2 +- setup.cfg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index f70bcd7242c..f8978808141 100644 --- a/environment.yml +++ b/environment.yml @@ -46,7 +46,7 @@ dependencies: - segmentation-models-pytorch>=0.2 - setuptools>=42 - sphinx>=4,<6 - - tensorboard>=1.6 + - tensorboard>=2.9.1 - timm>=0.4.12 - torchmetrics>=0.10 - zipfile-deflate64>=0.2 diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 3ce6fc0e17a..765f8a2194b 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -51,4 +51,4 @@ nbmake==1.3.3 omegaconf==2.1.0 pytest==6.1.2 pytest-cov==2.4.0 -tensorboard==1.6.0 +tensorboard==2.9.1 diff --git a/setup.cfg b/setup.cfg index 09a018c160c..a50ee99f354 100644 --- a/setup.cfg +++ b/setup.cfg @@ -127,8 +127,8 @@ tests = pytest>=6.1.2,<8 # pytest-cov 2.4+ required for pytest --cov flags pytest-cov>=2.4,<5 - # tensorboard 1.6+ is first release - tensorboard>=1.6,<3 + # tensorboard 2.9.1+ required by lightning + tensorboard>=2.9.1,<3 all = torchgeo[datasets,docs,style,tests] From 8586b19a744cc326ea6e8c5329951553bfcf6d1a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 2 Apr 2023 14:20:20 -0500 Subject: [PATCH 3/4] Remove explicit tensorboard install from GitHub Actions --- .github/workflows/release.yaml | 2 +- .github/workflows/tutorials.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 46f6917f416..b7d2b3c0800 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -72,7 +72,7 @@ jobs: - name: Install pip dependencies if: steps.cache.outputs.cache-hit != 'true' run: | - pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures tensorboard + pip install .[docs,tests] planetary_computer pystac pytest-rerunfailure pip list - name: Run notebook checks run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials diff --git a/.github/workflows/tutorials.yaml b/.github/workflows/tutorials.yaml index 32537bf6424..674fbdabc86 100644 --- a/.github/workflows/tutorials.yaml +++ b/.github/workflows/tutorials.yaml @@ -30,7 +30,7 @@ jobs: - name: Install pip dependencies if: steps.cache.outputs.cache-hit != 'true' run: | - pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures tensorboard + pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures pip list - name: Run notebook checks run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials From 72752f5d694406b7839523772f67e4806716105a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 2 Apr 2023 14:20:47 -0500 Subject: [PATCH 4/4] Fix typo --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b7d2b3c0800..4e96ed90a26 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -72,7 +72,7 @@ jobs: - name: Install pip dependencies if: steps.cache.outputs.cache-hit != 'true' run: | - pip install .[docs,tests] planetary_computer pystac pytest-rerunfailure + pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures pip list - name: Run notebook checks run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials