Skip to content

Commit 4770a9e

Browse files
committed
Moved requirements to setup, use requirements of setup file to configure test environment.
1 parent 03210c1 commit 4770a9e

2 files changed

Lines changed: 24 additions & 11 deletions

File tree

ci_scripts/install.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,22 @@ popd
2626
# provided versions
2727
conda create -n testenv --yes python=$PYTHON_VERSION pip
2828
source activate testenv
29-
pip install pytest pytest-xdist pytest-timeout numpy scipy cython scikit-learn==$SKLEARN_VERSION \
30-
oslo.concurrency
29+
pip install scikit-learn==$SKLEARN_VERSION
30+
31+
python --version
32+
pip install -e '.[test]'
33+
python -c "import numpy; print('numpy %s' % numpy.__version__)"
34+
python -c "import scipy; print('scipy %s' % scipy.__version__)"
3135

3236
if [[ "$EXAMPLES" == "true" ]]; then
33-
pip install matplotlib jupyter notebook nbconvert nbformat jupyter_client \
34-
ipython ipykernel pandas seaborn
37+
pip install -e '.[examples]'
3538
fi
3639
if [[ "$DOCTEST" == "true" ]]; then
37-
pip install pandas sphinx_bootstrap_theme
40+
pip install sphinx_bootstrap_theme
3841
fi
3942
if [[ "$COVERAGE" == "true" ]]; then
4043
pip install codecov pytest-cov
4144
fi
4245
if [[ "$RUN_FLAKE8" == "true" ]]; then
4346
pip install flake8 mypy
4447
fi
45-
46-
python --version
47-
python -c "import numpy; print('numpy %s' % numpy.__version__)"
48-
python -c "import scipy; print('scipy %s' % scipy.__version__)"
49-
pip install -e '.[test]'

setup.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,22 @@
4444
'test': [
4545
'nbconvert',
4646
'jupyter_client',
47-
'matplotlib'
47+
'matplotlib',
48+
'pytest',
49+
'pytest-xdist',
50+
'pytest-timeout',
51+
52+
],
53+
'examples': [
54+
'matplotlib',
55+
'jupyter',
56+
'notebook',
57+
'nbconvert',
58+
'nbformat',
59+
'jupyter_client',
60+
'ipython',
61+
'ipykernel',
62+
'seaborn'
4863
]
4964
},
5065
test_suite="pytest",

0 commit comments

Comments
 (0)