wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-15 12:54:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1738 from blink1073/test-3.5

Browse Source 
TST: Test against py35, remove py32 test
This commit is contained in:
Josh Warner
2015-10-06 17:26:58 -07:00
parent d66babe9bb 4ccf7787a3
commit 844b8b9052
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -38,9 +38,9 @@ notifications:
python: python:
- 2.6 - 2.6
- 2.7 - 2.7
- 3.2
- 3.3 - 3.3
- 3.4 - 3.4
- 3.5
before_install: before_install:
- ccache -s - ccache -s
optional_requirements.txt
+1 -1
View File
@@ -1,6 +1,6 @@
PySide; python_version != '2.7' PySide; python_version != '2.7'
imread; python_version != '2.7' imread; python_version != '2.7'
SimpleITK; python_version != '3.4' SimpleITK; python_version != '3.4' and python_version != '3.5'
astropy astropy
tifffile tifffile
imageio; python_version != '2.6' imageio; python_version != '2.6'
tools/travis_before_install.sh
-5
View File
@@ -52,11 +52,6 @@ source ~/venv/bin/activate
pip install --upgrade pip pip install --upgrade pip
pip install --retries 3 -q wheel flake8 coveralls nose pip install --retries 3 -q wheel flake8 coveralls nose
# on Python 3.2, use matplotlib 1.3.1
if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then
sed -i 's/matplotlib>=.*/matplotlib==1.3.1/g' requirements.txt
fi
# install wheels # install wheels
for requirement in $WHEELBINARIES; do for requirement in $WHEELBINARIES; do
WHEELS="$WHEELS $(grep $requirement requirements.txt)" WHEELS="$WHEELS $(grep $requirement requirements.txt)"