update CI

sdpython · Jul 24, 2022 · f1ab66e · f1ab66e
1 parent ca6fee8
commit f1ab66e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.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
 
@@ -37,31 +37,43 @@ jobs:
                     sudo apt-get install -y graphviz
           
       - run:
-          name: Install libproj
+          name: Install dependencies for proj
           command: |
-            sudo apt-get install -y libgeos-dev libproj-dev proj-data graphviz
+            sudo apt-get install -y libgeos-dev proj-data graphviz sqlite3 libtiff5 libtiff5-dev libtiff-dev libsqlite3-dev libcurl4-gnutls-dev
+
+      - run:
+          name: build proj
+          command: |
+            # see https://stackoverflow.com/questions/72442087/cant-install-proj-8-0-0-for-cartopy-linux
+            wget https://download.osgeo.org/proj/proj-9.0.0.tar.gz
+            tar -xf proj-9.0.0.tar.gz
+            cd proj-9.0.0
+            mkdir build && cd build
+            cmake ..
+            cmake --build .
+            sudo cmake --build . --target install
+            cd ..
+
+      - run:
+          name: install ldconfig
+          command: |
+            sudo ldconfig
 
       - 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:
           name: Install numba, llvmlite
           command: |
-            python -m venv venv
-            . venv/bin/activate
             # export LLVM_CONFIG=/usr/local/opt/llvm/bin/llvm-config
             sudo ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config
             pip install llvmlite numba
 
       - 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
@@ -70,8 +82,6 @@ jobs:
       - run:
           name: install dependencies
           command: |
-            python -m venv venv
-            . venv/bin/activate
             pip install wheel
             pip install -r requirements.txt
 
@@ -83,29 +93,24 @@ 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
             python setup.py unittests
 
       - run:
           name: wheel
           command: |
-            . venv/bin/activate
             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:

diff --git a/.gitignore b/.gitignore
@@ -260,3 +260,6 @@ _doc/sphinxdoc/source/nbcov*.png
 _unittests/unittests.out
 _doc/sphinxdoc/source/_temp_custom_run_script_.py.pkl
 _doc/sphinxdoc/source/_temp_custom_run_script_.py
+_doc/sphinxdoc/source/check_python_install/*
+_doc/sphinxdoc/source/oxoxo/*
+_doc/sphinxdoc/source/phdoc_static/*.js
diff --git a/appveyor.yml b/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%"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,8 +4,8 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python39-Linux:
-        python.version: '3.9'
+      Python310-Linux:
+        python.version: '3.10'
     maxParallel: 3
   steps:
   - task: UsePythonVersion@0
@@ -48,9 +48,8 @@ jobs:
   - script: |
       python -m pip install cibuildwheel
       export CIBW_MANYLINUX_X86_64_IMAGE="manylinux2014"
-      export CIBW_BEFORE_BUILD="pip install ."
-      export CIBW_BEFORE_BUILD="pip install numpy;pip install pybind11 cython scipy pyquickhelper"
-      export CIBW_BUILD="cp37-manylinux_x86_64 cp39-manylinux_x86_64 cp38-manylinux_x86_64"
+      export CIBW_BEFORE_BUILD="pip install numpy pybind11 cython scipy pyquickhelper"
+      export CIBW_BUILD="cp37-manylinux_x86_64 cp39-manylinux_x86_64 cp38-manylinux_x86_64 cp310-manylinux_x86_64"
       export CIBW_REPAIR_WHEEL_COMMAND_LINUX="auditwheel repair -w {dest_dir} {wheel}  --plat manylinux2014_x86_64"
       python -m cibuildwheel --output-dir dist/wheelhouse --platform linux
     displayName: 'Build Package manylinux2014'
@@ -66,8 +65,8 @@ jobs:
     vmImage: 'macOS-latest'
   strategy:
     matrix:
-      Python39-MacOs:
-        python.version: "3.9"
+      Python310-MacOs:
+        python.version: "3.10"
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -114,9 +113,8 @@ jobs:
     displayName: 'Build Package'
   - script: |
       python -m pip install cibuildwheel
-      export CIBW_BEFORE_BUILD="pip install ."
-      export CIBW_BEFORE_BUILD="pip install numpy;pip install pybind11 cython scipy pyquickhelper"
-      export CIBW_BUILD="cp37-macosx_x86_64 cp38-macosx_x86_64 cp39-macosx_x86_64"
+      export CIBW_BEFORE_BUILD="pip install numpy pybind11 cython scipy pyquickhelper"
+      export CIBW_BUILD="cp37-macosx_x86_64 cp38-macosx_x86_64 cp39-macosx_x86_64 cp310-macosx_x86_64"
       python -m cibuildwheel --output-dir dist/wheelhouse
     displayName: 'Build Package many'
   - task: PublishPipelineArtifact@0
@@ -130,8 +128,8 @@ jobs:
     vmImage: 'windows-latest'
   strategy:
     matrix:
-      Python39-Linux:
-        python.version: '3.9'
+      Python310-Linux:
+        python.version: '3.10'
     maxParallel: 3
   steps:
   - task: UsePythonVersion@0
@@ -152,9 +150,8 @@ jobs:
     displayName: 'Runs Unit Tests'
   - script: |
       python -m pip install cibuildwheel
-      set CIBW_BEFORE_BUILD=pip install .
-      set CIBW_BEFORE_BUILD=pip install numpy&pip install pybind11 cython scipy pyquickhelper
-      set CIBW_BUILD=cp37-win_amd64 cp38-win_amd64 cp39-win_amd64
+      set CIBW_BEFORE_BUILD="pip install numpy&pip install pybind11 cython scipy pyquickhelper"
+      set CIBW_BUILD="cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64"
       python -m cibuildwheel --output-dir dist/wheelhouse
     displayName: 'Build Package many'
   - task: PublishPipelineArtifact@0

diff --git a/check_python_install/__init__.py b/check_python_install/__init__.py
@@ -5,7 +5,7 @@
 Checks other modules installation on CI.
 """
 
-__version__ = "0.1.51"
+__version__ = "0.1.97"
 __author__ = "Xavier Dupré"
 __github__ = "https://github.com/sdpython/_check_python_install"
 __url__ = "http://www.xavierdupre.fr/app/_check_python_install/helpsphinx/index.html"