From 5fec8974e0f50cbe86be521275d20aaf8d41991e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?xavier=20dupr=C3=A9?= <xavier.dupre@gmail.com>
Date: Sat, 2 Jan 2021 13:38:50 +0100
Subject: [PATCH] update CI

---
 .circleci/config.yml |  4 +++-
 .travis.yml          |  4 +++-
 appveyor.yml         |  4 ++++
 requirements.txt     | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a75fdcd..399dc57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,6 +48,7 @@ jobs:
             wget https://apt.llvm.org/llvm.sh
             chmod +x llvm.sh
             sudo ./llvm.sh 10
+            ls /usr/bin/llvm*
 
       - run:
           name: Install standard libraries
@@ -71,7 +72,8 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            export LLVM_CONFIG=/usr/local/opt/llvm/bin/llvm-config
+            # export LLVM_CONFIG=/usr/local/opt/llvm/bin/llvm-config
+            sudo ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config
             pip3 install llvmlite numba
 
       - run:
diff --git a/.travis.yml b/.travis.yml
index 774c067..7e4e651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,9 @@ before_install:
     - wget https://apt.llvm.org/llvm.sh
     - chmod +x llvm.sh
     - sudo ./llvm.sh 10
-    - export LLVM_CONFIG=/usr/local/opt/llvm/bin/llvm-config
+    - ls /usr/bin/llvm*
+    # - export LLVM_CONFIG=/usr/local/opt/llvm/bin/llvm-config
+    - sudo ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config
 
 install:
     - pip install -r requirements.txt
diff --git a/appveyor.yml b/appveyor.yml
index be71fa4..d605e57 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,11 @@ install:
   - "%PYTHON%\\Scripts\\pip install pymyinstall numpy"
   # for numba
   - "%PYTHON%\\Scripts\\pip install importlib_metadata"
+  # for cartopy
+  - "%PYTHON%\\Scripts\\pip install pyshp"
+  # 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
diff --git a/requirements.txt b/requirements.txt
index 0547899..4071864 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,25 @@
 autopep8
-cartopy
 coverage
 cython
 jupyter_sphinx
 jyquickhelper
-llvmlite
 matplotlib
-numba
 numpy
 pandas
 pycodestyle
 pylint
-pyproj
 pyquickhelper
 scipy
-shapely
 sphinx
 sphinxcontrib.imagesvg
 wheel
+
+# numba
+llvmlite
+numba
+
+# cartopy
+cartopy
+pyproj
+pyshp
+shapely