From 8ba774df59f3626a9c7a720eede57fde792c0dbc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 7 Dec 2018 11:20:42 +1100 Subject: [PATCH 1/5] Changed multibuild back to matthew-brett --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b4442f7..1f683f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = git://github.com/scikit-image/scikit-image.git [submodule "multibuild"] path = multibuild - url = https://github.com/scikit-image/multibuild.git + url = https://github.com/matthew-brett/multibuild.git From 6208c5ddad5652517685b86fa7f5fc961817579f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 7 Dec 2018 11:20:51 +1100 Subject: [PATCH 2/5] Updated multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 0623c58..951b6c6 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 0623c582027a5c914a24d5e0823d5e3c47d43101 +Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b From c3211c5e7def13b493a4ce908691a5146bf747be Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 7 Dec 2018 11:12:46 +1100 Subject: [PATCH 3/5] Removed pinning of wheel --- config.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config.sh b/config.sh index 2b4658e..56da887 100644 --- a/config.sh +++ b/config.sh @@ -10,11 +10,7 @@ EXTRA_WHEELS_URL=https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.s function pre_build { # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. - # Pin wheel version that auditwheel sees. Auditwheel current installed for - # Python 3.6. - if [ -z "$IS_OSX" ]; then - /opt/python/cp36-cp36m/bin/python -m pip install wheel==0.31.1 - fi + : } function pip_opts { From a08cad8f70f240fd0040e201d1bae87c56d91c6c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 6 May 2019 07:06:31 -0400 Subject: [PATCH 4/5] Add pip list to view what is installed before the tests are run --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index 56da887..6aea9ef 100644 --- a/config.sh +++ b/config.sh @@ -27,6 +27,7 @@ function build_wheel { function run_tests { # Runs tests on installed distribution from an empty directory python --version + python -m pip list echo "backend : agg" > matplotlibrc pytest --pyargs skimage } From 058d4fd9c909ea430002bbc562a9572d186f4177 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 6 May 2019 07:19:02 -0400 Subject: [PATCH 5/5] Remove pip list command. --- config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/config.sh b/config.sh index 6aea9ef..56da887 100644 --- a/config.sh +++ b/config.sh @@ -27,7 +27,6 @@ function build_wheel { function run_tests { # Runs tests on installed distribution from an empty directory python --version - python -m pip list echo "backend : agg" > matplotlibrc pytest --pyargs skimage }