Skip to content

Commit 0703f29

Browse files
committed
Merge pull request #381 from effigies/install_types
Need to add 'requirements.txt' to MANIFEST.in I think.
2 parents 668f48b + 70abc56 commit 0703f29

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

.travis.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ env:
2121
global:
2222
- DEPENDS="numpy scipy matplotlib h5py"
2323
- PYDICOM=1
24+
- INSTALL_TYPE="setup"
2425
python:
2526
- 2.6
2627
- 3.2
@@ -48,6 +49,15 @@ matrix:
4849
- python: 2.7
4950
env:
5051
- DOC_DOC_TEST=1
52+
- python: 2.7
53+
env:
54+
- INSTALL_TYPE=sdist
55+
- python: 2.7
56+
env:
57+
- INSTALL_TYPE=wheel
58+
- python: 2.7
59+
env:
60+
- INSTALL_TYPE=requirements
5161
before_install:
5262
- source tools/travis_tools.sh
5363
- virtualenv --python=python venv
@@ -70,7 +80,21 @@ before_install:
7080
fi
7181
# command to install dependencies
7282
install:
73-
- python setup.py install
83+
- |
84+
if [ "$INSTALL_TYPE" == "setup" ]; then
85+
python setup.py install
86+
elif [ "$INSTALL_TYPE" == "sdist" ]; then
87+
python setup_egg.py egg_info # check egg_info while we're here
88+
python setup_egg.py sdist
89+
wheelhouse_pip_install dist/*.tar.gz
90+
elif [ "$INSTALL_TYPE" == "wheel" ]; then
91+
pip install wheel
92+
python setup_egg.py bdist_wheel
93+
wheelhouse_pip_install dist/*.whl
94+
elif [ "$INSTALL_TYPE" == "requirements" ]; then
95+
wheelhouse_pip_install -r requirements.txt
96+
python setup.py install
97+
fi
7498
# Point to nibabel data directory
7599
- export NIBABEL_DATA_DIR="$PWD/nibabel-data"
76100
# command to run tests, e.g. python setup.py test

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
numpy>=1.5.1

0 commit comments

Comments
 (0)