Updating Shapely to version 1.8.5.post1 across the repo

Riverscapes · Sep 17, 2024 · 2f5604f · 2f5604f
1 parent e775e8b
commit 2f5604f
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 36 deletions.
diff --git a/.devcontainer/requirements.docker.txt b/.devcontainer/requirements.docker.txt
@@ -34,7 +34,7 @@ scikit-fuzzy==0.4.2
 scikit-image==0.19.2
 scipy>=1.8.1
 semver==2.10.2
-Shapely==1.8.2
+Shapely==1.8.5.post1
 snuggs==1.4.7
 sympy==1.8
 termcolor==1.1.0

diff --git a/DEVELOPMENT_NOTES.md b/DEVELOPMENT_NOTES.md
@@ -0,0 +1,34 @@
+## VSCode can't find my environemt
+
+Because our workspaces are running in subfolders (usually `packages/TOOL_NAME`) sometimes VSCode doesn't include our `.venv` folder which is sitting in the root of the repo.
+
+One way to make this work is just to symlink the `.venv` folder into the `packages/TOOL_NAME` folder. This way VSCode will be able to find the environment.
+
+```bash
+cd packages/TOOL_NAME
+ln -s ../../.venv .venv
+```
+
+## Instructions for using `pyenv` on a MAc
+
+### 1. Install `pyenv` using Homebrew
+```bash
+brew install pyenv
+pyenv init
+# Follow instructions to copy pyenv init to your shell's .zshrc or .bashrc
+```
+
+### 2. Install the version of python you want
+
+```bash
+pyenv install 3.8.10
+```
+
+### 3. Create a venv with the version of python you want
+
+```bash
+pyenv shell 3.8.10
+python3 --version
+```
+
+You should now see `Python 3.8.10` as the version of python you are using. Now when you create your venv from running `bootstrap.sh` you should be able to get the correct version of python.
diff --git a/bin/requirements.txt b/bin/requirements.txt
@@ -39,7 +39,7 @@ Rtree>=0.9.4
 scikit-fuzzy==0.4.2
 scipy>=1.8.1
 semver==2.10.2
-Shapely==1.8.2
+Shapely==1.8.5.post1
 six==1.15.0
 snuggs==1.4.7
 termcolor==1.1.0

diff --git a/lib/commons/rscommons/__version__.py b/lib/commons/rscommons/__version__.py
@@ -1 +1 @@
-__version__ = "1.4.9"
+__version__ = "1.4.10"
diff --git a/lib/commons/setup.py b/lib/commons/setup.py
@@ -7,7 +7,7 @@
 install_requires = [
     'geojson', 'sciencebasepy', 'requests', 'semver>=2.10.2',
     'termcolor', 'Cython>=0.29.23', 'numpy>=1.21.0', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'jinja2>=2.11.3', 'psutil==5.8.0'
 ]
 

diff --git a/packages/anthro/anthro/__version__.py b/packages/anthro/anthro/__version__.py
@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"
diff --git a/packages/anthro/setup.py b/packages/anthro/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.23', 'numpy>=1.21.0', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/blm_context/blm_context/__version__.py b/packages/blm_context/blm_context/__version__.py
@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"
diff --git a/packages/blm_context/setup.py b/packages/blm_context/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2', 'scikit-fuzzy>=0.4.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1', 'scikit-fuzzy>=0.4.2',
     'rs-commons'
 ]
 

diff --git a/packages/brat/setup.py b/packages/brat/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2', 'scikit-fuzzy>=0.4.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1', 'scikit-fuzzy>=0.4.2',
     'rs-commons'
 ]
 

diff --git a/packages/brat/sqlbrat/__version__.py b/packages/brat/sqlbrat/__version__.py
@@ -1 +1 @@
-__version__ = "5.0.0"
+__version__ = "5.0.1"
diff --git a/packages/channel/channel/__version__.py b/packages/channel/channel/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/packages/channel/setup.py b/packages/channel/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/confinement/confinement/__version__.py b/packages/confinement/confinement/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/packages/confinement/setup.py b/packages/confinement/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/hand/hand/__version__.py b/packages/hand/hand/__version__.py
@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
diff --git a/packages/hand/setup.py b/packages/hand/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/hydro/hydro/__version__.py b/packages/hydro/hydro/__version__.py
@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"
diff --git a/packages/hydro/setup.py b/packages/hydro/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.23', 'numpy>=1.21.0', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/rcat/rcat/__version__.py b/packages/rcat/rcat/__version__.py
@@ -1 +1 @@
-__version__ = "4.0.1"
+__version__ = "4.0.2"
diff --git a/packages/rcat/setup.py b/packages/rcat/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.23', 'numpy>=1.21.0', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 
@@ -36,4 +36,4 @@
       packages=[
           'rcat'
       ]
-      )
+      )
diff --git a/packages/rme/rme/__version__.py b/packages/rme/rme/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/packages/rme/setup.py b/packages/rme/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/rscontext/rscontext/__version__.py b/packages/rscontext/rscontext/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/packages/rscontext/setup.py b/packages/rscontext/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/rvd/rvd/__version__.py b/packages/rvd/rvd/__version__.py
@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1"
diff --git a/packages/rvd/setup.py b/packages/rvd/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/taudem/setup.py b/packages/taudem/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.7', 'numpy>=1.16.3', 'scipy>=1.8',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/taudem/taudem/__version__.py b/packages/taudem/taudem/__version__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/packages/vbet/setup.py b/packages/vbet/setup.py
@@ -6,7 +6,7 @@
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 install_requires = [
     'termcolor', 'Cython>=0.29.23', 'numpy>=1.21.0', 'scipy>=1.8.1',
-    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.2',
+    'argparse', 'GDAL>=3.0', 'rasterio>=1.1.5', 'Shapely==1.8.5.post1',
     'rs-commons'
 ]
 

diff --git a/packages/vbet/vbet/__version__.py b/packages/vbet/vbet/__version__.py
@@ -1 +1 @@
-__version__ = "4.0.1"
+__version__ = "4.0.2"
diff --git a/requirements_cybercastor.txt b/requirements_cybercastor.txt
@@ -3,16 +3,16 @@ appdirs==1.4.4
 astroid==2.4.2
 attrs==20.1.0
 autopep8==1.5.4
-awscli==1.19.66
 click==7.1.2
 click-plugins==1.1.1
 cligj==0.5.0
 colorama==0.4.3
-Cython==3.0.8
+Cython==0.29.23
 decorator==4.4.2
 distlib==0.3.1
 docutils==0.15.2
 filelock==3.0.12
+GDAL==3.3.2
 html5print==0.1.2
 isort==5.4.2
 jinja2>=2.11.3
@@ -28,26 +28,26 @@ psutil==5.8.0
 psycopg2-binary==2.9.3
 pyasn1==0.4.8
 pycodestyle==2.6.0
+pygeoprocessing==2.4.0
 Pygments>=2.7.4
 PyInquirer==1.0.3
 pylint==2.6.0
 pyparsing==2.4.7
 python-dateutil==2.8.1
-rasterio>=1.1.5
+rasterio>=1.3.3
 regex==2020.7.14
 rsa>=4.7
 Rtree>=0.9.4
 scikit-fuzzy==0.4.2
 scikit-image==0.19.2
 scipy>=1.8.1
 semver==2.10.2
-Shapely==1.8.2
+Shapely==1.8.5.post1
 six==1.15.0
 snuggs==1.4.7
 sympy==1.8
 termcolor==1.1.0
 toml==0.10.1
 urllib3>=1.26.5
-virtualenv==20.0.26
 wcwidth==0.2.5
 wrapt==1.12.1