Update local test setup to python 3

deploy_requirements.txt

@@ -11,6 +11,6 @@ pyparsing==2.4.7
 snowballstemmer==2.1.0
 Sphinx==1.8.5
 sphinxcontrib-websupport==1.1.2
-typing==3.10.0.0
+typing==3.7.4.3
 zope.event==4.5.0
 zope.interface==5.4.0

docker/local-run/Dockerfile

@@ -1,4 +1,4 @@
-FROM pcic/pdp-base-minimal:1.0.0
+FROM pcic/pdp-base-minimal:pdp-python3
 LABEL Maintainer="Rod Glover <rglover@uvic.ca>"
 
 USER root
@@ -14,6 +14,6 @@ USER ${USERNAME}
 WORKDIR /codebase
 ADD *requirements.txt /codebase/
 
-RUN pip install -r requirements.txt -r test_requirements.txt -r deploy_requirements.txt
+RUN pip3 install -r requirements.txt -r test_requirements.txt -r deploy_requirements.txt
 
 ENTRYPOINT ./docker/local-run/entrypoint.sh

docker/local-run/docker-compose.yaml

@@ -25,9 +25,6 @@ services:
       - NCWMS_URL=http://docker-dev02.pcic.uvic.ca:30779/dynamic/x
       - OLD_NCWMS_URL=https://services.pacificclimate.org/ncWMS-PCIC/wms
       - TILECACHE_URL=https://a.tile.pacificclimate.org/tilecache/tilecache.py https://b.tile.pacificclimate.org/tilecache/tilecache.py https://c.tile.pacificclimate.org/tilecache/tilecache.py
-      # In order to pass environment variables with *content* of the form
-      # `${...}` through to JavaScript, the `$` must be escaped as `$$`
-      - BC_BASEMAP_URL=https://services.pacificclimate.org/tiles/bc-albers-lite/$${z}/$${x}/$${y}.png
     entrypoint: /codebase/docker/local-run/entrypoint-fe.sh
     volumes:
       # This is to enable installing local versions of other packages from

docker/local-run/entrypoint-be.sh

@@ -12,6 +12,6 @@
 #pip install -e /home/rglover/code/pdp_util
 
 # *Always* do this. It's the whole point of this Docker setup.
-pip install -e .
+pip3 install -e .
 
 gunicorn --config docker/local-run/gunicorn.conf --log-config docker/local-run/logging.conf pdp.wsgi:backend

docker/local-run/entrypoint-fe.sh

@@ -12,6 +12,6 @@
 #pip install -e /home/rglover/code/pdp_util
 
 # *Always* do this. It's the whole point of this Docker setup.
-pip install -e .
+pip3 install -e .
 
 gunicorn --config docker/local-run/gunicorn.conf --log-config docker/local-run/logging.conf pdp.wsgi:frontend

docker/local-run/entrypoint.sh

@@ -11,6 +11,6 @@
 #pip install -e /home/rglover/code/pdp_util
 
 # *Always* do this. It's the whole point of this Docker setup.
-pip install -e .
+pip3 install -e .
 
 /bin/bash

requirements.txt

@@ -8,73 +8,61 @@ chardet==3.0.4
 click==7.1.2
 coards==1.0.5
 cryptography==3.3.2
-# pre-installed
-#Cython==0.27.3
+#Cython==0.27.3 - pre-installed in docker. needed?
 enum34==1.1.6
 Flask==1.0.2
 funcsigs==1.0.2
 ga-wsgi-client==0.1
-# pre-installed
-#GDAL==2.2.0
-Genshi==0.7
+GDAL==3.0.4
+Genshi==0.7.5
 GeoAlchemy==0.7.3
 GeoAlchemy2==0.9.1
 gitdb2==2.0.6
 GitPython==2.1.15
-# pre-installed
-# h5py==2.7.1
+# h5py==3.2.1 - pre-installed in docker
 idna==2.6
 ipaddress==1.0.17
 itsdangerous==0.24
 Jinja2==2.11.3
 keyring==10.6.0
 keyrings.alt==3.0
 Mako==1.1.4
-MarkupSafe==1.0
+MarkupSafe==2.0
 modelmeta==0.3.0
 nchelpers==5.5.7
-netCDF4==1.5.5.1
-# pre-installed
-# numpy==1.16.6
+netCDF4==1.3.0
+# numpy==1.21.2 - pre-installed in docker
 olefile==0.46
 openid2rp==1.12
 Paste==2.0.3
-pdp-util==1.2.1
+pdp-util==2.1.0 # actually using a custom version
 Pillow==4.3.0
 ply==3.10
-psycopg2==2.7.3.2
-pupynere-pdp==1.1.6
+psycopg2==2.9.1
+pupynere-pdp==2.0.1
 PyCDS==2.2.1
 PyCRS==1.0.2
 pycrypto==2.6.1
-pydap-pdp==3.2.6
-pydap.handlers.csv==0.3
-pydap.handlers.hdf5==0.5.2
-pydap.handlers.pcic==0.0.11
-pydap.handlers.sql==0.10
-pydap.responses.aaigrid==0.7
-pydap.responses.html==0.3
-pydap.responses.netcdf==0.6.0
-pydap.responses.xlsx==0.1
-# We use Ubuntu package; ver 3.26.1 not avail from pypi.org
-#pygobject==3.26.1
+Pydap==3.2.2
+pydap_extras
+#pygobject==3.26.1 - not available, lack doesn't seem to matter
 pystache==0.5.4
 python-dateutil==2.6.1
 python-editor==1.0.4
 pytz==2017.3
-PyYAML==5.4
-requests==2.21.0
+PyYAML==5.4.1
+requests==2.25.1
 SecretStorage==2.3.1
 simplejson==3.12.0
 six==1.11.0
 slimit==0.8.1
 smmap==3.0.5
 smmap2==3.0.1
-SQLAlchemy==1.3.0
+SQLAlchemy==1.4.3 #added for pydap-extras
 sqlparse==0.3.1
 static==1.1.1
 urllib3==1.26.5
-WebOb==1.7.3
-Werkzeug==0.15.3
-XlsxWriter==1.0.2
+WebOb==1.8.7
+Werkzeug==2.0.1
+XlsxWriter==1.3.8
 xlwt==1.3.0