From 12cad684c84b633f9d8d3816f5313f0649a7f697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?xavier=20dupr=C3=A9?= <xavier.dupre@gmail.com>
Date: Sun, 10 May 2020 12:31:32 +0200
Subject: [PATCH] update CI

---
 .circleci/config.yml | 14 +++++++++++---
 .travis.yml          |  4 ----
 requirements.txt     |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b2a617..4735a41 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
           name: Install pyproj (1)
           command: |
             # requires libstdc++6 >= 9
-            sudo apt-get install -y libgeos-dev libproj-dev proj-data graphviz libgfortran3 libblas-dev liblapack-dev
+            sudo apt-get install -y libgeos-dev libproj-dev proj-data graphviz
             export PYPROJMAJVER=15
             export PYPROJVERSION=6.3.1-1
             # export PYPROJMAJVER=19
@@ -58,11 +58,19 @@ jobs:
       #      sudo pip install git+https://github.com/pyproj4/pyproj.git
 
       - run:
-          name: Install cartopy
+          name: Install standard libraries
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            pip3 install scipy matplotlib cython shapely pyproj
+            pip3 install scipy matplotlib numpy cython pandas
+
+      - run:
+          name: Install pyproj, shapely, cartopy
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip3 install pyproj
+            pip3 install shapely
             pip3 install cartopy
 
       - run:
diff --git a/.travis.yml b/.travis.yml
index 0e6f940..e124ab8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,8 @@ python:
 before_install:
     - sudo apt-get install libgeos-dev libproj-dev proj-data graphviz libgfortran3 libblas-dev liblapack-dev
 install:
-    - pip install scipy matplotlib cython shapely pyproj
     #- pip install git+https://github.com/SciTools/cartopy.git
-    - pip install cartopy
     - pip install -r requirements.txt
-    - pip uninstall -y shapely
-    - pip install shapely
     - pip freeze
     - apt list --installed
 script:
diff --git a/requirements.txt b/requirements.txt
index 0b8742f..69b37b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 cartopy
 coverage
+cython
 jyquickhelper
 matplotlib
 numpy