Updating versions and reasoning on shapely and pyproj

environment.yml

@@ -8,12 +8,12 @@ dependencies:
   - numpy
   - pip
   - pycocotools
-  - pyproj>=3.0
+  - pyproj>=3.1
   - python>=3.6
   - pytorch-gpu>=1.7
   - rarfile>=3
   - rasterio>=1.0.16
-  - shapely
+  - shapely>1.7.0
   - torchvision>=0.3
   - pip:
     - black>=21.4b0

requirements.txt

@@ -27,8 +27,8 @@ pillow>=2.9
 pycocotools
 # pydocstyle 6.1+ required for pyproject.toml support
 pydocstyle[toml]>=6.1
-# pyproj required for fast CRS conversion
-pyproj>=3.0
+# pyproj 3.1+ required as it contains threadsafe Transformer and CRS implementations
+pyproj>=3.1
 # pytest 6+ required for pyproject.toml support
 pytest>=6
 # pytest-cov 2.4+ required for pytest --cov flags
@@ -52,8 +52,8 @@ scikit-learn>=0.18
 segmentation-models-pytorch>=0.2
 # setuptools 30.4+ required for options.packages.find section in setup.cfg
 setuptools>=30.4
-# shapely is required for manipulating and warping geometries
-shapely
+# shapely 1.7.0 and up is required as that is the earliest version we tested
+shapely>=1.7.0
 # sphinx 3+ required for autodoc_typehints = description
 sphinx>=3
 # torch 1.7+ required for typing

setup.cfg

@@ -30,10 +30,10 @@ install_requires =
     matplotlib
     numpy
     pillow>=2.9
-    pyproj>=3.0
+    pyproj>=3.1
     rasterio>=1.0.16
     rtree>=0.5
-    shapely
+    shapely>=1.7.0
     torch>=1.7
     torchvision>=0.3
 python_requires = >= 3.6

spack.yaml

@@ -18,7 +18,7 @@ spack:
   - "py-omegaconf@2.1:"
   - "py-pycocotools"
   - "py-pydocstyle@6.1:+toml"
-  - "py-pyproj@3.0:"
+  - "py-pyproj@3.1:"
   - "py-pytest@6:"
   - "py-pytest-cov@2.4:"
   - "py-pytorch-lightning@1.3:"
@@ -30,7 +30,7 @@ spack:
   - "py-scikit-learn@0.18:"
   - "py-segmentation-models-pytorch@0.2:"
   - "py-setuptools@30.4:"
-  - "py-shapely"
+  - "py-shapely@1.7.0:"
   - "py-sphinx@3:"
   - "py-torch@1.7:"
   - "py-torchmetrics"