update GitHub Actions/CI to Python 3.10 (#1543) (#1586)

Author: tomkralidis

.github/workflows/flake8.yml

@@ -0,0 +1,24 @@
+name: flake8
+
+on:
+  [ push, pull_request ]
+
+jobs:
+  flake8_py3:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+        name: setup Python
+        with:
+          python-version: '3.10'
+      - name: Checkout pygeoapi
+        uses: actions/checkout@master
+      - name: Install flake8
+        run: pip3 install flake8
+      - name: Run flake8
+        uses: suo/flake8-github-action@releases/v1
+        with:
+          checkName: 'flake8_py3'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

@@ -14,33 +14,12 @@ on:
       - released
 
 jobs:
-  flake8_py3:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-          architecture: x64
-          cache: 'pip'
-      - name: Checkout pygeoapi
-        uses: actions/checkout@master
-      - name: Install flake8
-        run: pip install flake8
-      - name: Run flake8
-        uses: suo/flake8-github-action@releases/v1
-        with:
-          checkName: 'flake8_py3'   # NOTE: this needs to be the same as the job name
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   main:
-    needs: [flake8_py3]
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
-          - python-version: 3.8
+          - python-version: '3.10'
     env:
       PYGEOAPI_CONFIG: "$(pwd)/pygeoapi-config.yml"
 
@@ -115,7 +94,6 @@ jobs:
         python3 setup.py install
         pip3 install --upgrade numpy elasticsearch
         pip3 install --upgrade numpy "sqlalchemy<2"
-        pip3 install --upgrade flake8
         pip3 install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
         #pip3 install --upgrade rasterio==1.1.8
     - name: setup test data ⚙️
@@ -169,12 +147,11 @@ jobs:
         pip3 list -v
 
   admin:
-    needs: [flake8_py3]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
-          - python-version: 3.8
+          - python-version: '3.10'
     env:
       PYGEOAPI_CONFIG: "tests/pygeoapi-test-config-admin.yml"
       PYGEOAPI_OPENAPI: "tests/pygeoapi-test-openapi-admin.yml"

docs/source/development.rst

@@ -82,7 +82,7 @@ Install Python with the option to enable SQLite extensions:
 
 .. code-block:: bash
 
-   LDFLAGS="-L/usr/local/opt/sqlite/lib -L/usr/local/opt/zlib/lib" CPPFLAGS="-I/usr/local/opt/sqlite/include -I/usr/local/opt/zlib/include" PYTHON_CONFIGURE_OPTS="--enable-loadable-sqlite-extensions" pyenv install 3.7.6
+   LDFLAGS="-L/usr/local/opt/sqlite/lib -L/usr/local/opt/zlib/lib" CPPFLAGS="-I/usr/local/opt/sqlite/include -I/usr/local/opt/zlib/include" PYTHON_CONFIGURE_OPTS="--enable-loadable-sqlite-extensions" pyenv install 3.10.12
 
 Configure SQLite from Homebrew over that one shipped with the OS:
 

pygeoapi/models/cql.py

@@ -33,8 +33,7 @@
 # =================================================================
 
 from datetime import date, datetime
-from typing import Any, List, Optional, Union
-from typing_extensions import Literal
+from typing import Any, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field, RootModel
 

requirements-provider.txt

@@ -7,8 +7,7 @@ GDAL<=3.8.3
 geoalchemy
 netCDF4
 oracledb
-pandas; python_version < '3.7'
-pandas==1.2.5; python_version >= '3.7'
+pandas
 psycopg2
 pygeofilter[backend-sqlalchemy]
 pygeoif

requirements.txt

@@ -2,7 +2,6 @@ Babel
 click
 filelock
 Flask
-importlib_metadata
 jinja2
 jsonschema
 pydantic
@@ -17,5 +16,4 @@ requests
 shapely<2.0
 SQLAlchemy<2.0.0
 tinydb
-typing-extensions
 unicodecsv