From 300570523a3a064810a398de4fa45e3c5162a672 Mon Sep 17 00:00:00 2001 From: Henning Redestig Date: Thu, 4 May 2017 12:59:20 +0200 Subject: [PATCH] chore: re-enable linux py27 --- .travis.yml | 8 ++++---- config.sh | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e5881413..c8cc5cc14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ matrix: python: 3.5 env: - TOXENV=pep8 - # - os: linux - # env: - # - MB_PYTHON_VERSION=2.7 + - os: linux + env: + - MB_PYTHON_VERSION=2.7 - os: linux env: - MB_PYTHON_VERSION=3.4 @@ -70,7 +70,7 @@ before_install: - if [[ -n "${MB_PYTHON_VERSION}" ]]; then (travis_retry git clone https://github.com/matthew-brett/multibuild.git && cd multibuild && git checkout edf5b691d0d565b4e65e655b983c11c883acbeca); TEST_DEPENDS="swiglpk optlang sympy decorator cython codecov coverage numpy scipy jsonschema six pytest pytest-cov pytest-benchmark tabulate"; - BUILD_DEPENDS="swiglpk optlang sympy cython numpy scipy auditwheel==1.5"; + BUILD_DEPENDS="swiglpk optlang sympy cython numpy scipy"; source multibuild/common_utils.sh; source multibuild/travis_steps.sh; before_install; diff --git a/config.sh b/config.sh index f567000b6..4f16a87cd 100644 --- a/config.sh +++ b/config.sh @@ -25,8 +25,7 @@ function pre_build { function build_wheel { # Set default building method to pip build_bdist_wheel $@ - # since swiglpk doesn't have wheels, we currently must keep glpk - # installed for testing + # remove glpk installation to ensure using the packaged binaries (cd glpk-4.61 && make uninstall) }