Skip to content

TST: explicitly install setuptools #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

TST: explicitly install setuptools #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0db571
TST: explicitly install setuptools
tacaswell Dec 20, 2017
6c3f450
TST: use pip to install
tacaswell Dec 20, 2017
abcc209
TST: drop 32 versions and try to add py3.6 tests
tacaswell Dec 20, 2017
37a8741
TST: cargo-cult CMD_IN_ENV to get 2.7 tests working
tacaswell Dec 20, 2017
446c89b
TST: add version information for 3.6 test
tacaswell Dec 20, 2017
feaee36
TST: add travis test for 3.6
tacaswell Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ matrix:
- python: 2.7
- python: 3.4
- python: 3.5
- python: 3.6
- python: "nightly"
env: PRE=--pre
allow_failures:
Expand Down
22 changes: 7 additions & 15 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,22 @@ 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"
PYTHON_VERSION: "3.6"

install:
# Install Python (from the official .msi of https://python.org) and pip when
# not already installed.
Expand All @@ -44,10 +36,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"
- "%CMD_IN_ENV% pip install six nose pytest pytest-cov coverage setuptools"

# Install the generated wheel package to test it
- "python setup.py install"
- "%CMD_IN_ENV% pip install -v ."


# Not a .NET project, we build scikit-image in the install step instead
Expand All @@ -56,7 +48,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.
Expand Down