diff --git a/.appveyor.yml b/.appveyor.yml index a6df47e..a25a72b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,10 +15,7 @@ environment: DAILY_COMMIT: master matrix: - - PYTHON: C:\Python36 - PYTHON: C:\Python36-x64 - - PYTHON: C:\Python37 - - PYTHON: C:\Python37-x64 init: - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" @@ -54,7 +51,8 @@ install: # Install the build dependencies of the project. - pip install %NP_TEST_DEP% - pip install -r requirements\build.txt - - python setup.py bdist_wheel + - pip list + - python setup.py bdist_wheel -vv - ps: | # Upload artifact to Appveyor immediately after build ls dist -r | Foreach-Object { @@ -80,6 +78,7 @@ test_script: # Check Python version just in case - python --version # Run unit tests with pytest + - pip list - pytest --pyargs skimage - cd .. diff --git a/.travis.yml b/.travis.yml index 7f9b934..fc605b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,21 +40,10 @@ matrix: env: - MB_PYTHON_VERSION=3.6 - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - os: osx language: generic env: - MB_PYTHON_VERSION=3.6 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.7 before_install: - if [ "$TRAVIS_BRANCH" == "master" ]; then diff --git a/config.sh b/config.sh index c6dab02..c9ecc77 100644 --- a/config.sh +++ b/config.sh @@ -15,12 +15,13 @@ function pre_build { function pip_opts { # Define extra pip arguments - echo "--prefer-binary --find-links $EXTRA_WHEELS_URL" + echo "--prefer-binary --find-links $EXTRA_WHEELS_URL" } function build_wheel { # Horrible set of build requirements installs too-recent numpy when using # default pip wheel command + pip list build_bdist_wheel $@ } @@ -28,5 +29,6 @@ function run_tests { # Runs tests on installed distribution from an empty directory python --version echo "backend : agg" > matplotlibrc + pip list pytest --pyargs skimage }