From a0db57175b4c160c9dfe32e01c8fd3d101570a5a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 10:44:13 -0500 Subject: [PATCH 1/6] TST: explicitly install setuptools --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 38e946f..93f8cfc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,7 +44,7 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install -v six nose pytest pytest-cov coverage" + - "%CMD_IN_ENV% pip install -v six nose pytest pytest-cov coverage setuptools" # Install the generated wheel package to test it - "python setup.py install" From 6c3f4502bacd625e2d36384397d690389533a587 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 10:48:01 -0500 Subject: [PATCH 2/6] TST: use pip to install --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 93f8cfc..dcbbd21 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,10 +44,10 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install -v six nose pytest pytest-cov coverage setuptools" + - "%CMD_IN_ENV% pip install six nose pytest pytest-cov coverage setuptools" # Install the generated wheel package to test it - - "python setup.py install" + - "pip install -v ." # Not a .NET project, we build scikit-image in the install step instead From abcc209825cc0bb24c9175a06744b7644aded5fa Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 10:55:11 -0500 Subject: [PATCH 3/6] TST: drop 32 versions and try to add py3.6 tests --- appveyor.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dcbbd21..0384fc5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,30 +9,21 @@ environment: CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\run_with_env.cmd" matrix: - - PYTHON: "C:\\Python27_32" - PYTHON_VERSION: "2.7" - PYTHON_ARCH: "32" - - PYTHON: "C:\\Python27_64" PYTHON_VERSION: "2.7" PYTHON_ARCH: "64" - - PYTHON: "C:\\Python34_32" - PYTHON_VERSION: "3.4.3" - PYTHON_ARCH: "32" - - PYTHON: "C:\\Python34_64" PYTHON_VERSION: "3.4.3" PYTHON_ARCH: "64" - - PYTHON: "C:\\Python35" - PYTHON_VERSION: "3.5.0" - PYTHON_ARCH: "32" - - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.0" PYTHON_ARCH: "64" + - PYTHON: "C:\\Python36-x64" + PYTHON_ARCH: "64" + install: # Install Python (from the official .msi of https://python.org) and pip when # not already installed. From 37a87417d7e8ada1379ba5175e96c51115767156 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 10:55:29 -0500 Subject: [PATCH 4/6] TST: cargo-cult CMD_IN_ENV to get 2.7 tests working --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0384fc5..b1875ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,7 +38,7 @@ install: - "%CMD_IN_ENV% pip install six nose pytest pytest-cov coverage setuptools" # Install the generated wheel package to test it - - "pip install -v ." + - "%CMD_IN_ENV% pip install -v ." # Not a .NET project, we build scikit-image in the install step instead @@ -47,7 +47,7 @@ build: false test_script: # Run unit tests with nose - - "python run_tests.py" + - "%CMD_IN_ENV% python run_tests.py" artifacts: # Archive the generated wheel package in the ci.appveyor.com build report. From 446c89b8be433a4764d7e85eb88ee64294e394ee Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 11:00:46 -0500 Subject: [PATCH 5/6] TST: add version information for 3.6 test --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index b1875ac..7f7e114 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,7 @@ environment: - PYTHON: "C:\\Python36-x64" PYTHON_ARCH: "64" + PYTHON_VERSION: "3.6" install: # Install Python (from the official .msi of https://python.org) and pip when From feaee36c6923fbece5d9eb844c06faf6cc6b8e06 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 20 Dec 2017 11:01:31 -0500 Subject: [PATCH 6/6] TST: add travis test for 3.6 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b0669fd..8e839e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ matrix: - python: 2.7 - python: 3.4 - python: 3.5 + - python: 3.6 - python: "nightly" env: PRE=--pre allow_failures: