update CI

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:3.9.6
+      - image: cimg/python:3.10.5
 
     working_directory: ~/repo
 
@@ -14,17 +14,12 @@ jobs:
           - v2-dependencies-{{ checksum "requirements.txt" }}
           - v2-dependencies-
 
-#       - run:
-#           name: Install omp
-#           command: |
-#                     sudo apt-get install -y libomp-dev
-
       - run:
           name: Install pandoc
           command: |
                     sudo apt-get update 
-                    wget https://github.com/jgm/pandoc/releases/download/2.14.1/pandoc-2.14.1-1-amd64.deb
-                    sudo dpkg -i pandoc-2.14.1-1-amd64.deb
+                    wget https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-1-amd64.deb
+                    sudo dpkg -i pandoc-2.18-1-amd64.deb
 
       - run:
           name: Install tex
@@ -56,8 +51,6 @@ jobs:
       - run:
           name: Install pyproj, shapely, cartopy
           command: |
-            python -m venv venv
-            . venv/bin/activate
             pip install pyproj
             pip uninstall -y shapely
             pip install --no-binary shapely shapely
@@ -66,8 +59,6 @@ jobs:
       - run:
           name: Install standard libraries
           command: |
-            python -m venv venv
-            . venv/bin/activate
             pip install scipy matplotlib numpy cython pandas wheel pybind11 llvmlite numba
 
       - run:
@@ -83,15 +74,11 @@ jobs:
       - run:
           name: Install standard libraries
           command: |
-            python -m venv venv
-            . venv/bin/activate
             pip install scipy matplotlib numpy cython pandas wheel pybind11
 
       - run:
           name: install dependencies (2)
           command: |
-            python3 -m venv venv
-            . venv/bin/activate
             pip install -r requirements.txt
 
       - save_cache:
@@ -102,39 +89,23 @@ jobs:
       - run:
           name: check list of dependencies
           command: |
-            python -m venv venv
-            . venv/bin/activate
             pip freeze
             apt list --installed
         
       - run:
           name: run tests
           command: |
-            . venv/bin/activate
             export PYTHONPATH=src
             python setup.py unittests -d 15 -g ".*((LONG)|(SKIP)|(notebooks)).*"
           # Some tests take for ever, cutting the list.
 
       - run:
           name: wheel
           command: |
-            . venv/bin/activate
             export PYTHONPATH=src
             python setup.py bdist_wheel
             mkdir -p test-reports/dist
             cp dist/*.whl test-reports/dist
-
-#      - run:
-#          name: documentation
-#          command: |
-#           . venv/bin/activate
-#           python setup.py build_sphinx
-#           
-#      - run:
-#          name: copy documentation
-#          command: |
-#           mkdir -p test-reports/doc
-#           zip -r -9  test-reports/doc/documentation_html.zip _doc/sphinxdoc/build/html
             
       - store_artifacts:
           path: test-reports

appveyor.yml

@@ -2,8 +2,8 @@ image:
   - Visual Studio 2019
 environment:
   matrix:
-    - PYTHON: "C:\\Python39-x64"
-      PYTHON_VERSION: "3.9.x"
+    - PYTHON: "C:\\Python310-x64"
+      PYTHON_VERSION: "3.10.x"
       PYTHON_ARCH: "64"
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
@@ -13,7 +13,7 @@ install:
   - pip install pyquicksetup
   - pip install wheel pymyinstall
   # install precompiled versions not available on pypi
-  - "%PYTHON%\\Scripts\\pymy_install3 cartopy pyproj shapely fiona gdal llvmlite"
+  - "%PYTHON%\\Scripts\\pymy_install3 cartopy pyproj shapely fiona gdal"
   # for many packages
   - "%PYTHON%\\Scripts\\pip install -r requirements-win.txt"
   # onnx