From e8bcbc081dfb5d1e7298039d47bbebf7048b8e62 Mon Sep 17 00:00:00 2001
From: Sylvain Bellemare <sbellem@gmail.com>
Date: Fri, 22 Feb 2019 13:28:20 +0000
Subject: [PATCH] Fix failing travis builds for tests and docs

* Upgrade/install setuptools as installing charm would complain about
missing setuptools
* Use Python 3.7
---
 .ci/travis-install.sh | 10 ++++++----
 .travis.yml           |  4 +++-
 setup.py              |  1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.ci/travis-install.sh b/.ci/travis-install.sh
index 968f6ba7..8fb9161d 100755
--- a/.ci/travis-install.sh
+++ b/.ci/travis-install.sh
@@ -4,10 +4,12 @@ set -e -x
 
 pip install --upgrade pip
 
-# will not be needed for flake8
-git clone https://github.com/JHUISI/charm.git
-cd charm && ./configure.sh && make install
-cd ..
+if [ "${BUILD}" != "flake8" ]; then
+    pip install --upgrade setuptools
+    git clone https://github.com/JHUISI/charm.git
+    cd charm && ./configure.sh && make install
+    cd ..
+fi
 
 if [ "${BUILD}" == "tests" ]; then
     pip install -e .[test]
diff --git a/.travis.yml b/.travis.yml
index 82f9796f..921449fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: python
-python: 3.6
+sudo: required
+dist: xenial
+python: 3.7
 
 env:
   global:
diff --git a/setup.py b/setup.py
index 5e095794..1f95d18e 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,6 @@
     'ecdsa',
     'zfec>=1.5.0',
     'gipc',
-    'charm-crypto @ https://github.com/JHUISI/charm.git@dev',
     'coincurve',
 ]