update CI

appveyor.yml

@@ -11,18 +11,12 @@ init:
 install:
   - "%PYTHON%\\python -m pip install --upgrade pip"
   # for many packages
-  - "%PYTHON%\\Scripts\\pip install pymyinstall numpy"
-  # for numba
-  - "%PYTHON%\\Scripts\\pip install importlib_metadata"
-  # for cartopy
-  - "%PYTHON%\\Scripts\\pip install pyshp"
+  - "%PYTHON%\\Scripts\\pip install -r requirements-win.txt"
   # install precompiled versions not available on pypi
   - "%PYTHON%\\Scripts\\pymy_install3 cartopy pyproj shapely llvmlite numba"
   # other dependencies
   - "%PYTHON%\\Scripts\\pip install -r requirements.txt --no-deps"
 
-build: off
-
 test_script:
   - "%PYTHON%\\python -u .\\setup.py unittests"
 

azure-pipelines.yml

@@ -7,7 +7,6 @@ jobs:
       Python39:
         python.version: '3.9'
     maxParallel: 3
-
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -21,18 +20,23 @@ jobs:
     displayName: 'Install Pandoc'
   - script: sudo apt-get install -y texlive texlive-latex-extra texlive-xetex dvipng
     displayName: 'Install Latex'
+  - script: sudo apt-get install -y libgeos-dev libproj-dev proj-data graphviz libblas-dev liblapack-dev
+    displayName: 'Install Geos packages'
+  - script: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 10
+          ls /usr/bin/llvm*
+          export LLVM_CONFIG=/usr/bin/llvm-config
+    displayName: 'Install llvmlite'
   - script: sudo apt-get install -y p7zip-full
     displayName: 'Install 7z, rar'
   - script: sudo apt-get install -y graphviz
     displayName: 'Install Graphviz'
   - script: python -m pip install --upgrade pip setuptools wheel
     displayName: 'Install tools'
-  - script: pip install numpy scipy
-    displayName: 'Install numpy scipy'
   - script: pip install -r requirements.txt
     displayName: 'Install Requirements'
-  - script: python -m pip install scikit-learn
-    displayName: 'Install scipy scikit-learn'    
   - script: python -u setup.py unittests
     displayName: 'Runs Unit Tests'
   - script: python -u setup.py bdist_wheel
@@ -51,15 +55,13 @@ jobs:
     matrix:
       Python39:
         python.version: "3.9"
-
   steps:
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
   - script: gcc --version
     displayName: 'gcc version'
-
   - script: |
           brew update
     displayName: 'brew update'
@@ -88,13 +90,12 @@ jobs:
   - script: python -m pip install --upgrade pip setuptools wheel
     displayName: 'Install tools'
   - bash: conda info -a
+    displayName: 'Info'
   - bash: conda create --yes --quiet --name pyenv -c defaults -c conda-forge python=$PYTHON_VERSION tox sphinx jupyter Cython numpy mkl scipy scikit-learn pandas coverage pylint
     displayName: Create Anaconda environment.
   - bash: conda list
   - bash: source activate pyenv
-  - script: conda install numpy scipy
-    displayName: 'Install numpy scipy'
-  - script: pip install -r requirements.txt
+  - script: conda install requirements.txt
     displayName: 'Install Requirements'
   - script: export PYTHONPATH=src
     displayName: 'PYTHONPATH=src'

requirements-win.txt

@@ -0,0 +1,6 @@
+astroid
+importlib_metadata
+matplotlib
+numpy
+pymyinstall
+pyshp

requirements.txt

@@ -14,14 +14,6 @@ sphinx
 sphinxcontrib.imagesvg
 wheel
 
-# matplotlib
-cycler
-kiwisolver
-pillow
-pyparsing
-python-dateutil
-six
-
 # numba
 llvmlite
 numba