upgrade to python 3.10

.github/workflows/pypi-publish.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/python-ci.yml

@@ -6,14 +6,17 @@ jobs:
   test:
 
     runs-on: ubuntu-22.04
-    container: pcic/geospatial-python:3.3.0
+    container: pcic/geospatial-python:python-310
 
     steps:
     - uses: actions/checkout@v2
     - name: Install system dependencies
       run: |
-        apk upgrade
-        apk add libxml2-dev libxslt-dev libffi-dev
+        apt-get update
+        apt-get install -yq libxml2-dev
+        apt-get install -yq libxslt-dev
+        apt-get install -yq libffi-dev
+        apt-get install -yq wget
 
     - name: Install poetry
       run: |

ce/api/geo.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from collections import OrderedDict
+from collections import OrderedDict, deque
 from threading import RLock
 from contextlib import ContextDecorator, contextmanager
 import shutil
@@ -16,7 +16,7 @@
 
 # From http://stackoverflow.com/a/30316760/597593
 from numbers import Number
-from collections import Set, Mapping, deque
+from collections.abc import Set, Mapping
 
 from tempfile import NamedTemporaryFile
 

docker/Dockerfile.dev

@@ -1,11 +1,11 @@
-FROM pcic/geospatial-python:3.3.0
+FROM pcic/geospatial-python:python-310
 
 RUN mkdir /app
 ADD poetry.lock /app
 ADD pyproject.toml /app
 WORKDIR /app
 
-RUN apk add libffi-dev
+RUN apt-get install libffi-dev
 RUN wget -O - https://install.python-poetry.org | python3 -
 ENV PATH=/root/.local/bin:$PATH
 RUN poetry install --with=dev

docker/Dockerfile.prod

@@ -1,12 +1,19 @@
 # Image with gdal 3.3.0
-FROM pcic/geospatial-python:3.3.0
+FROM pcic/geospatial-python:python-310
 
-RUN apk add postgresql-dev libxml2-dev libxslt-dev geos-dev
+RUN apt-get update
+# RUN apt list --installed
+# RUN apt-get install postgresql-dev
+RUN apt-get install libpq-dev
+RUN apt-get install libxml2-dev
+# RUN apt-get install libxslt-dev
+RUN apt-get install libgeos-dev
+RUN apt-get install wget
 
 ADD . /app
 WORKDIR /app
 
-RUN apk add libffi-dev
+RUN apt-get install libffi-dev
 RUN wget -O - https://install.python-poetry.org | python3 -
 ENV PATH=/root/.local/bin:$PATH
 RUN poetry install