From d91234a8ebeb440e052c19487c27817baf4c7ad0 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 16:08:53 -0700 Subject: [PATCH 01/19] fix appveyor? --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4131b5..bbd14ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,8 +33,6 @@ install: # install needed dependencies, and pre-install numpy, scipy - "%PYTHON%\\python.exe -m pip install wheel numpy scipy" -build: false # Not a C# project, build stuff at the test step instead. - test_script: # Build the compiled extension and run the project tests - ".\\appveyor\\build.cmd %PYTHON%\\python.exe setup.py test" From 645c5f03413ee44476de51e86b56d1e7e568e655 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 16:18:35 -0700 Subject: [PATCH 02/19] trying travis --- .travis.yml | 2 ++ appveyor.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cda3047..bc803ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ notifications: email: false +sudo: required + deploy: provider: releases api_key: diff --git a/appveyor.yml b/appveyor.yml index bbd14ca..f4131b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,8 @@ install: # install needed dependencies, and pre-install numpy, scipy - "%PYTHON%\\python.exe -m pip install wheel numpy scipy" +build: false # Not a C# project, build stuff at the test step instead. + test_script: # Build the compiled extension and run the project tests - ".\\appveyor\\build.cmd %PYTHON%\\python.exe setup.py test" From fac86572a85d3a22bc1772b4340e7897e6904f39 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 17:05:16 -0700 Subject: [PATCH 03/19] trying again --- .travis.yml | 62 +++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc803ed..015351e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,40 +4,42 @@ notifications: email: false -sudo: required +language: python -deploy: - provider: releases - api_key: - secure: EOGvA7WTRss3MYJiZWQI29FxHjuKZgteBzdBk7ZJW5a7VmjTVJMBbAD/EnDC2rRrtkhJ+8dtDpnA6y49bsktRnj3c+//SYryVgVu+gRuZRenRR9tAHiXNTylZ9+e1pJVUBwDLdaLuF1gmpQYYvzf5AGYLWSifhn+L3qytfBxj8w= - file_glob: true - file: wheelhouse/ecos-*.whl - skip_cleanup: true - on: - branch: master - tags: true - -matrix: +jobs: include: - - sudo: required - services: - - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 - - sudo: required - services: - - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 - PRE_CMD=linux32 - - os: osx - env: PYTHON=python2 + # perform a linux build + - services: docker + # and a mac build - os: osx - env: PYTHON=python3 + # PyPy 7.3.2 needs macOS >= 10.14 + osx_image: xcode10.2 + language: shell + # and a windows build + - os: windows + language: shell + before_install: + - choco install python --version 3.8.0 + - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" + # make sure it's on PATH as 'python3' + - ln -s /c/Python38/python.exe /c/Python38/python3.exe + +env: + global: + - TWINE_USERNAME=123 + # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi + - python3 -m pip install cibuildwheel==1.6.3 script: - - make version - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/travis/build-wheels.sh; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./travis/build-osx-wheels.sh; fi - - ls wheelhouse/ + # build the wheels, put them into './wheelhouse' + - python3 -m cibuildwheel --output-dir wheelhouse + +after_success: + # if the release was tagged, upload them to PyPI + - | + if [[ $TRAVIS_TAG ]]; then + python3 -m pip install twine + python3 -m twine upload wheelhouse/*.whl + fi From 99458974314cfbf6f3405e500ae4c523d7acbdd8 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:07:10 -0700 Subject: [PATCH 04/19] skip 39 --- .travis.yml | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 015351e..da4d227 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,42 +4,40 @@ notifications: email: false -language: python +deploy: + provider: releases + api_key: + secure: EOGvA7WTRss3MYJiZWQI29FxHjuKZgteBzdBk7ZJW5a7VmjTVJMBbAD/EnDC2rRrtkhJ+8dtDpnA6y49bsktRnj3c+//SYryVgVu+gRuZRenRR9tAHiXNTylZ9+e1pJVUBwDLdaLuF1gmpQYYvzf5AGYLWSifhn+L3qytfBxj8w= + file_glob: true + file: wheelhouse/ecos-*.whl + skip_cleanup: true + on: + branch: master + tags: true -jobs: +CIBW_SKIP: cp39-* + +matrix: include: - # perform a linux build - - services: docker - # and a mac build + - sudo: required + services: + - docker + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 + - sudo: required + services: + - docker + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 + PRE_CMD=linux32 - os: osx - # PyPy 7.3.2 needs macOS >= 10.14 - osx_image: xcode10.2 - language: shell - # and a windows build - - os: windows - language: shell - before_install: - - choco install python --version 3.8.0 - - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" - # make sure it's on PATH as 'python3' - - ln -s /c/Python38/python.exe /c/Python38/python3.exe - -env: - global: - - TWINE_USERNAME=123 - # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings + env: PYTHON=python2 + - os: osx + env: PYTHON=python3 install: - - python3 -m pip install cibuildwheel==1.6.3 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi script: - # build the wheels, put them into './wheelhouse' - - python3 -m cibuildwheel --output-dir wheelhouse - -after_success: - # if the release was tagged, upload them to PyPI - - | - if [[ $TRAVIS_TAG ]]; then - python3 -m pip install twine - python3 -m twine upload wheelhouse/*.whl - fi + - make version + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/travis/build-wheels.sh; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./travis/build-osx-wheels.sh; fi + - ls wheelhouse/ From 72b2b3edb499503ddbefd997935ecca683a77201 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:25:44 -0700 Subject: [PATCH 05/19] test again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da4d227..9f50b2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,12 @@ deploy: branch: master tags: true -CIBW_SKIP: cp39-* - matrix: include: - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 PYTHON=python36 - sudo: required services: - docker @@ -30,8 +28,10 @@ matrix: PRE_CMD=linux32 - os: osx env: PYTHON=python2 + sudo: required - os: osx env: PYTHON=python3 + sudo: required install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi From a8f172962104e77740fbd08208488135921b61fa Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:28:48 -0700 Subject: [PATCH 06/19] linux maybe --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f50b2a..a2a7516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,17 +20,17 @@ matrix: - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 PYTHON=python36 + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 CIBW_SKIP: cp39-* - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 CIBW_SKIP: cp39-* PRE_CMD=linux32 - os: osx env: PYTHON=python2 sudo: required - os: osx - env: PYTHON=python3 + env: PYTHON=python3 CIBW_SKIP: cp39-* sudo: required install: From 2f113d8a24ff06fa8bcb1e76ec701ae835f22dcc Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:29:09 -0700 Subject: [PATCH 07/19] oops --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2a7516..53236c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,17 +20,17 @@ matrix: - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 CIBW_SKIP: cp39-* + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 CIBW_SKIP=cp39-* - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 CIBW_SKIP: cp39-* + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 CIBW_SKIP=cp39-* PRE_CMD=linux32 - os: osx env: PYTHON=python2 sudo: required - os: osx - env: PYTHON=python3 CIBW_SKIP: cp39-* + env: PYTHON=python3 CIBW_SKIP=cp39-* sudo: required install: From c03a973f3c702528d95d7a34e1bf3bdbf64ac32d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:49:25 -0700 Subject: [PATCH 08/19] more tries --- .travis.yml | 8 +++----- appveyor.yml | 10 +++++++--- travis/build-wheels.sh | 7 +++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53236c7..cda3047 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,18 +20,16 @@ matrix: - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 CIBW_SKIP=cp39-* + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 - sudo: required services: - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 CIBW_SKIP=cp39-* + env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 PRE_CMD=linux32 - os: osx env: PYTHON=python2 - sudo: required - os: osx - env: PYTHON=python3 CIBW_SKIP=cp39-* - sudo: required + env: PYTHON=python3 install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi diff --git a/appveyor.yml b/appveyor.yml index f4131b5..23392ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,14 +4,18 @@ environment: matrix: - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python34" + # - PYTHON: "C:\\Python34" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36" + - PYTHON: "C:\\Python37" + - PYTHON: "C:\\Python38" #- PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" + # - PYTHON: "C:\\Python34-x64" + # DISTUTILS_USE_SDK: "1" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36-x64" + - PYTHON: "C:\\Python37-x64" + - PYTHON: "C:\\Python38-x64" install: # initialize the submodule diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 63887e6..b9144ae 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -6,8 +6,11 @@ set -e -x # Compile wheels for PYBIN in /opt/python/*/bin; do - "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + # Skip Python 3.9 because no numpy and scipy wheels yet + if [! grep -q "cp39"]; then + "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + fi done # Bundle external shared libraries into the wheels From 2d80798e3e90712b698b823b626b1743aa793779 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:50:50 -0700 Subject: [PATCH 09/19] retry --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index b9144ae..07070ee 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -7,7 +7,7 @@ set -e -x # Compile wheels for PYBIN in /opt/python/*/bin; do # Skip Python 3.9 because no numpy and scipy wheels yet - if [! grep -q "cp39"]; then + if [! echo "$PYBIN" | grep -q "cp39"]; then "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt "${PYBIN}/pip" wheel /io/ -w wheelhouse/ fi From c910cf6f65b863b999b202ff97d3db2a03d62532 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 18:53:07 -0700 Subject: [PATCH 10/19] again --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 07070ee..ed1d33a 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -7,7 +7,7 @@ set -e -x # Compile wheels for PYBIN in /opt/python/*/bin; do # Skip Python 3.9 because no numpy and scipy wheels yet - if [! echo "$PYBIN" | grep -q "cp39"]; then + if ! echo "$PYBIN" | grep -q "cp39"; then "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt "${PYBIN}/pip" wheel /io/ -w wheelhouse/ fi From 05cd2a04c004d0d8059a0c8fab95e9b726aa2783 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 19:03:58 -0700 Subject: [PATCH 11/19] clarification --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index ed1d33a..018a797 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -30,6 +30,6 @@ done # Install packages and test for PYBIN in /opt/python/*/bin/; do - "${PYBIN}/pip" install ecos --no-index -f /io/wheelhouse + "${PYBIN}/pip" install ecos --no-index --find-links=/io/wheelhouse (cd "$HOME"; "${PYBIN}/nosetests" --with-cover --cover-package=ecos /io/src/test_interface.py /io/src/test_interface_bb.py) done From 248c8ad3433937e7b65e15b34cbb9f65bf81c634 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 19:13:01 -0700 Subject: [PATCH 12/19] user? --- travis/build-osx-wheels.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 8a2c987..b0ed7ae 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -2,8 +2,8 @@ set -e -x # Compile wheels -$PYTHON -m pip install nose coverage -$PYTHON -m pip wheel . -w wheelhouse/ +$PYTHON -m --user pip install nose coverage +$PYTHON -m --user pip wheel . -w wheelhouse/ -$PYTHON -m pip install ecos --no-index -f wheelhouse -$PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py +$PYTHON -m --user pip install ecos --no-index -f wheelhouse +$PYTHON -m --user nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 9ece3f8ccef771ad6844b1211b005d60de481c32 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 19:15:52 -0700 Subject: [PATCH 13/19] user 2.0 --- travis/build-osx-wheels.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index b0ed7ae..79a686b 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -2,8 +2,8 @@ set -e -x # Compile wheels -$PYTHON -m --user pip install nose coverage -$PYTHON -m --user pip wheel . -w wheelhouse/ +$PYTHON -m pip install --user nose coverage +$PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m --user pip install ecos --no-index -f wheelhouse -$PYTHON -m --user nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py +$PYTHON -m pip install --user ecos --no-index -f wheelhouse +$PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 4ad60ceec42d1ff75f1344add3ef5e2417f4b5d9 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 19:54:18 -0700 Subject: [PATCH 14/19] new try --- .travis.yml | 2 ++ travis/build-osx-wheels.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cda3047..59cb18c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,10 @@ matrix: PRE_CMD=linux32 - os: osx env: PYTHON=python2 + language: python - os: osx env: PYTHON=python3 + language: python install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 79a686b..8a2c987 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -2,8 +2,8 @@ set -e -x # Compile wheels -$PYTHON -m pip install --user nose coverage +$PYTHON -m pip install nose coverage $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install --user ecos --no-index -f wheelhouse +$PYTHON -m pip install ecos --no-index -f wheelhouse $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From b0a286705db4911973b6ee1a545b533e71201a7d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 19:57:50 -0700 Subject: [PATCH 15/19] user 3.0 --- .travis.yml | 6 ++---- travis/build-osx-wheels.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59cb18c..198d114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,12 +26,10 @@ matrix: - docker env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 PRE_CMD=linux32 - - os: osx - env: PYTHON=python2 - language: python + # - os: osx + # env: PYTHON=python2 - os: osx env: PYTHON=python3 - language: python install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 8a2c987..79a686b 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -2,8 +2,8 @@ set -e -x # Compile wheels -$PYTHON -m pip install nose coverage +$PYTHON -m pip install --user nose coverage $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install ecos --no-index -f wheelhouse +$PYTHON -m pip install --user ecos --no-index -f wheelhouse $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 3ba09fa30a8574b8c92fbe45b4d61542a4bc2f91 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 22:05:59 -0700 Subject: [PATCH 16/19] experiment 1 --- travis/build-osx-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 79a686b..7910f3b 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -5,5 +5,5 @@ set -e -x $PYTHON -m pip install --user nose coverage $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install --user ecos --no-index -f wheelhouse +$PYTHON -m pip install --user --no-index --find-links=wheelhouse $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 33e627b148a843ada93b50d5b8b0de76b586ff54 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 22:09:01 -0700 Subject: [PATCH 17/19] experiment 2 --- travis/build-osx-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 7910f3b..b7ed2e3 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -5,5 +5,5 @@ set -e -x $PYTHON -m pip install --user nose coverage $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install --user --no-index --find-links=wheelhouse +$PYTHON -m pip install --user ecos==2.0.7.post1-19-gb0a2867 --no-index --find-links=wheelhouse $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 553f80aea425daf7caf08da1651f4abe0d18d411 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 20 Oct 2020 22:12:49 -0700 Subject: [PATCH 18/19] experiment 3 --- travis/build-osx-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index b7ed2e3..8b3e8cc 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -5,5 +5,5 @@ set -e -x $PYTHON -m pip install --user nose coverage $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install --user ecos==2.0.7.post1-19-gb0a2867 --no-index --find-links=wheelhouse +$PYTHON -m pip install --user ecos>=2.0.7 --no-index --find-links=wheelhouse $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From 8d3d5464063930a3d93014970ef1c2df567c54f6 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Wed, 21 Oct 2020 11:48:01 -0700 Subject: [PATCH 19/19] ecos to 2.0.8 --- ecos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecos b/ecos index 40e26ef..3b98fe0 160000 --- a/ecos +++ b/ecos @@ -1 +1 @@ -Subproject commit 40e26efa371dd85b95bacc4ee825da80fa11a200 +Subproject commit 3b98fe0376ceeeb8310a06694b0a84ac59920f3f