Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.
Closed
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
77 changes: 29 additions & 48 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
env:
global:
- REPO_DIR="pywt"
- BUILD_COMMIT=v1.0.3
- BUILD_COMMIT=master
- PLAT=x86_64
- UNICODE_WIDTH=32
- NP_BUILD_DEP="numpy==1.9.1"
- NP_TEST_DEP="numpy==1.9.1"
- NP_BUILD_DEP="numpy==1.13.3"
- NP_TEST_DEP="numpy==1.15.4" # >=1.15 so NumPy works with pytest
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
- EXTRA_ARGV="'--disable-pytest-warnings'"
# Following generated with
# travis encrypt -r scikit-image/scikit-image-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
- secure:
Expand All @@ -24,91 +25,71 @@ matrix:
# Exclude the default Python 3.5 build
- python: 3.5
include:
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- UNICODE_WIDTH=16
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- os: linux
env:
- MB_PYTHON_VERSION=3.4
- os: linux
env:
- MB_PYTHON_VERSION=3.4
- PLAT=i686
- os: linux
env:
- MB_PYTHON_VERSION=3.5
- NP_BUILD_DEP=numpy==1.9.3
- NP_TEST_DEP=numpy==1.9.3
- os: linux
env:
- MB_PYTHON_VERSION=3.5
- PLAT=i686
- NP_BUILD_DEP=numpy==1.9.3
- NP_TEST_DEP=numpy==1.9.3
- os: linux
env:
- MB_PYTHON_VERSION=3.6
- NP_BUILD_DEP=numpy==1.11.3
- NP_TEST_DEP=numpy==1.11.3
- os: linux
env:
- MB_PYTHON_VERSION=3.6
- PLAT=i686
- NP_BUILD_DEP=numpy==1.11.3
- NP_TEST_DEP=numpy==1.11.3
- os: linux
env:
- MB_PYTHON_VERSION=3.7
- NP_BUILD_DEP=numpy==1.14.5
- NP_TEST_DEP=numpy==1.14.5
- os: linux
env:
- MB_PYTHON_VERSION=3.7
- PLAT=i686
- NP_BUILD_DEP=numpy==1.14.5
- NP_TEST_DEP=numpy==1.14.5
- os: osx
language: generic
env: MB_PYTHON_VERSION=2.7
- os: osx
language: generic
- os: linux
env:
- MB_PYTHON_VERSION=3.4
- MB_PYTHON_VERSION=3.8
- NP_BUILD_DEP=numpy==1.17.3
- NP_TEST_DEP=numpy==1.17.3
- os: linux
env:
- MB_PYTHON_VERSION=3.8
- PLAT=i686
- NP_BUILD_DEP=numpy==1.17.3
- NP_TEST_DEP=numpy==1.17.3
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.5
- NP_BUILD_DEP=numpy==1.9.3
- NP_TEST_DEP=numpy==1.9.3
- NP_BUILD_DEP=numpy==1.13.3
- NP_TEST_DEP=numpy==1.15.4
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.6
- NP_BUILD_DEP=numpy==1.11.3
- NP_TEST_DEP=numpy==1.11.3
- MB_PYTHON_OSX_VER=10.9
- NP_BUILD_DEP=numpy==1.13.3
- NP_TEST_DEP=numpy==1.15.4
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.7
- MB_PYTHON_OSX_VER=10.9
- NP_BUILD_DEP=numpy==1.14.5
- NP_TEST_DEP=numpy==1.14.5
- NP_TEST_DEP=numpy==1.15.4
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.8
- MB_PYTHON_OSX_VER=10.9
- NP_BUILD_DEP=numpy==1.17.3
- NP_TEST_DEP=numpy==1.17.3

before_install:
- BUILD_DEPENDS="$NP_BUILD_DEP Cython"
- TEST_DEPENDS="$NP_TEST_DEP nose"
- TEST_DEPENDS="$NP_TEST_DEP pytest"
- source multibuild/common_utils.sh
- source multibuild/travis_steps.sh
- before_install
Expand Down
42 changes: 25 additions & 17 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,42 @@ os: Visual Studio 2015
environment:
global:
# Remember to edit .travis.yml too
BUILD_COMMIT: v1.0.3
BUILD_COMMIT: master
WHEELHOUSE_UPLOADER_USERNAME: travis-worker
WHEELHOUSE_UPLOADER_SECRET:
secure:
9s0gdDGnNnTt7hvyNpn0/ZzOMGPdwPp2SewFTfGzYk7uI+rdAN9rFq2D1gAP4NQh
NP_BUILD_DEP: "1.10.4"
NP_TEST_DEP: "1.10.4"
NP_BUILD_DEP: "1.13.3"
NP_TEST_DEP: "1.15.4"

matrix:
- PYTHON: C:\Python38
NP_BUILD_DEP: "1.17.3"
NP_TEST_DEP: "1.17.3"
- PYTHON: C:\Python38-x64
NP_BUILD_DEP: "1.17.3"
NP_TEST_DEP: "1.17.3"
- PYTHON: C:\Python37
NP_BUILD_DEP: "1.14.5"
NP_TEST_DEP: "1.14.5"
- PYTHON: C:\Python37-x64
NP_BUILD_DEP: "1.14.5"
NP_TEST_DEP: "1.14.5"
- PYTHON: C:\Python36
NP_BUILD_DEP: "1.11.3"
NP_TEST_DEP: "1.11.3"
- PYTHON: C:\Python36-x64
NP_BUILD_DEP: "1.11.3"
NP_TEST_DEP: "1.11.3"
- PYTHON: C:\Python35
- PYTHON: C:\Python35-x64
- PYTHON: C:\Python27
- PYTHON: C:\Python27-x64

install:
- cmd: echo "Using cmd"
- cmd: echo "Filesystem root:"
- dir C:\

- echo "Installed SDKs:"
- dir "C:/Program Files/Microsoft SDKs/Windows"

# Get needed submodules
- git submodule update --init

# Install new Python if necessary
- ps: .\multibuild\install_python.ps1

# Prepend newly installed Python to the PATH of this build (this cannot be
# done from inside the powershell script as it would require to restart
Expand All @@ -54,9 +62,9 @@ install:
- python --version
- python -c "import struct; print(struct.calcsize('P') * 8)"

- python -m pip install --upgrade pip
# Pin wheel to 0.26 to avoid Windows ABI tag for built wheel
- pip install wheel==0.26
# Upgrade to the latest pip, setuptools, and wheel
- python -m pip install --upgrade pip setuptools wheel

- git submodule update --init
# Dependencies for package
- pip install numpy==%NP_BUILD_DEP% Cython
Expand All @@ -81,8 +89,8 @@ test_script:
# Run some tests
- mkdir tmp
- cd tmp
- pip install numpy==%NP_TEST_DEP% nose
- nosetests ..\pywt\tests
- pip install numpy==%NP_TEST_DEP% pytest
- pytest --pyargs pywt
- cd ..

after_test:
Expand Down
9 changes: 8 additions & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@ function pre_build {
:
}

function get_test_cmd {
local extra_argv=${1:-$EXTRA_ARGV}
echo "import sys; import pywt; \
sys.exit(not pywt.test('full', \
extra_argv=[${extra_argv}]))"
}

function run_tests {
# Runs tests on installed distribution from an empty directory
python --version
nosetests ../pywt/pywt/tests
python -c "$(get_test_cmd)"
}