Skip to content

Commit e8bcbc0

Browse files
committed
Fix failing travis builds for tests and docs
* Upgrade/install setuptools as installing charm would complain about missing setuptools * Use Python 3.7
1 parent 6593421 commit e8bcbc0

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.ci/travis-install.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ set -e -x
44

55
pip install --upgrade pip
66

7-
# will not be needed for flake8
8-
git clone https://github.com/JHUISI/charm.git
9-
cd charm && ./configure.sh && make install
10-
cd ..
7+
if [ "${BUILD}" != "flake8" ]; then
8+
pip install --upgrade setuptools
9+
git clone https://github.com/JHUISI/charm.git
10+
cd charm && ./configure.sh && make install
11+
cd ..
12+
fi
1113

1214
if [ "${BUILD}" == "tests" ]; then
1315
pip install -e .[test]

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: python
2-
python: 3.6
2+
sudo: required
3+
dist: xenial
4+
python: 3.7
35

46
env:
57
global:

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
'ecdsa',
2828
'zfec>=1.5.0',
2929
'gipc',
30-
'charm-crypto @ https://github.com/JHUISI/charm.git@dev',
3130
'coincurve',
3231
]
3332

0 commit comments

Comments
 (0)