Deps: make omegaconf/tensorboard optional

.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-rerunfailures
         pip list
     - name: Run notebook checks
       run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials

.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

environment.yml

@@ -46,6 +46,7 @@ dependencies:
     - segmentation-models-pytorch>=0.2
     - setuptools>=42
     - sphinx>=4,<6
+    - tensorboard>=2.9.1
     - timm>=0.4.12
     - torchmetrics>=0.10
     - zipfile-deflate64>=0.2

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==2.9.1

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

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

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 2.9.1+ required by lightning
+    tensorboard>=2.9.1,<3
 all =
     torchgeo[datasets,docs,style,tests]