Skip to content

Commit

Permalink
chore: re-enable linux py27
Browse files Browse the repository at this point in the history
  • Loading branch information
hredestig committed May 4, 2017
1 parent 431bcfe commit 3005705
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit 3005705

Please sign in to comment.