Skip to content
This repository has been archived by the owner on May 18, 2023. It is now read-only.

[Do Not Merge] Recreate issue 4270 in the main repo #31

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ environment:
# Encrypted to matthew-brett account, for now.
WHEELHOUSE_UPLOADER_SECRET:
secure: ozQ/OF7YF5bsfSd9CKAREE1YKWQy6ucciQ7446lFcJONOBG+/yvYtpPkpv4Dqrp7
NP_BUILD_DEP: "numpy==1.14.5"
NP_TEST_DEP: "numpy==1.14.5"
NP_BUILD_DEP: "numpy==1.13.3"
NP_TEST_DEP: "numpy==1.15.4"
DAILY_COMMIT: master

matrix:
- PYTHON: C:\Python36
- PYTHON: C:\Python36-x64
- PYTHON: C:\Python37
- PYTHON: C:\Python37-x64

init:
- "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\""
Expand Down Expand Up @@ -52,9 +49,10 @@ install:
- curl https://raw.githubusercontent.com/chemeris/msinttypes/master/stdint.h -o skimage/external/tifffile/stdint.h"

# Install the build dependencies of the project.
- pip install %NP_TEST_DEP%
- pip install %NP_BUILD_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 {
Expand All @@ -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 ..

Expand Down
15 changes: 2 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ env:
- BUILD_COMMIT=master
- PLAT=x86_64
- UNICODE_WIDTH=32
- NP_BUILD_DEP="numpy==1.14.5"
- NP_TEST_DEP="numpy==1.14.5"
- NP_BUILD_DEP="numpy==1.13.3"
- NP_TEST_DEP="numpy==1.15.4"
- GEN_DEPS="matplotlib networkx scipy pillow"
- MANYLINUX_URL=https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@ 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 $@
}

function run_tests {
# Runs tests on installed distribution from an empty directory
python --version
echo "backend : agg" > matplotlibrc
pip list
pytest --pyargs skimage
}