Skip to content

Commit 0e9909d

Browse files
authored
Merge pull request #156 from arokem/setup-requirements
Setup requirements.txt file
2 parents 37a84e3 + cb50ac8 commit 0e9909d

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

.travis.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,25 @@ deploy:
88
on:
99
tags: true
1010
repo: nipy/nitime
11+
1112
python:
1213
- 2.7
13-
- 3.5
14+
- 3.6
15+
1416
env:
15-
- CONDA_DEPS="pip pytest pytest-cov coverage numpy cython scipy matplotlib networkx" PIP_DEPS="coveralls python-coveralls nibabel"
17+
- PIP_DEPS="pip pytest pytest-cov coverage coveralls python-coveralls "
18+
19+
20+
python:
21+
- '2.7'
22+
- '3.6'
1623

17-
before_install:
18-
- export MINICONDA=$HOME/miniconda
19-
- export PATH="$MINICONDA/bin:$PATH"
20-
- hash -r
21-
- command -v conda >/dev/null || { wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
22-
-O miniconda.sh; bash miniconda.sh -b -f -p $MINICONDA; }
23-
- conda config --set always_yes yes
24-
- conda update conda
25-
- conda info -a
26-
- conda install python=$TRAVIS_PYTHON_VERSION $CONDA_DEPS
27-
- travis_retry pip install $PIP_DEPS
2824
install:
29-
- python setup.py install
25+
- travis_retry pip install $PIP_DEPS
26+
- travis_retry pip install -e .
27+
3028
script:
3129
- py.test --pyargs nitime --cov-report term-missing --cov=nitime --verbose
30+
3231
after_success:
3332
- coveralls

nitime/version.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,4 @@
9595
MICRO = _version_micro
9696
VERSION = __version__
9797
PACKAGE_DATA = {"nitime": ["LICENSE", "tests/*.txt", "tests/*.npy",
98-
"data/*.nii.gz","data/*.txt", "data/*.csv"]}
99-
REQUIRES = ["numpy", "matplotlib", "scipy"]
98+
"data/*.nii.gz", "data/*.txt", "data/*.csv"]}

requirements.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
numpy
2+
cython
3+
scipy
4+
matplotlib
5+
networkx
6+
nibabel

setup.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@
1717
with open(ver_file) as f:
1818
exec(f.read())
1919

20+
REQUIRES = []
21+
22+
with open('requirements.txt') as f:
23+
ll = f.readline()[:-1]
24+
while ll:
25+
REQUIRES.append(ll)
26+
ll = f.readline()[:-1]
27+
2028
PACKAGES = find_packages()
2129

2230

0 commit comments

Comments
 (0)