@@ -78,21 +78,13 @@ conda config --set ssl_verify false || exit 1
7878# Useful for debugging any issues with conda
7979conda info -a || exit 1
8080
81- REQ=" ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG} .txt"
82- conda create -n pandas python=$TRAVIS_PYTHON_VERSION || exit 1
83- conda install -n pandas --file=${REQ} || exit 1
84-
85- conda install -n pandas pip setuptools nose || exit 1
86- conda remove -n pandas pandas
81+ # build deps
82+ REQ=" ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG} .build"
83+ time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose || exit 1
84+ time conda install -n pandas --file=${REQ} || exit 1
8785
8886source activate pandas
8987
90- # we may have additional pip installs
91- REQ=" ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG} .pip"
92- if [ -e ${REQ} ]; then
93- pip install -r $REQ
94- fi
95-
9688# set the compiler cache to work
9789if [ " $IRON_TOKEN " ]; then
9890 export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
@@ -104,15 +96,33 @@ if [ "$IRON_TOKEN" ]; then
10496fi
10597
10698if [ " $BUILD_TEST " ]; then
99+
100+ # build testing
107101 pip uninstall --yes cython
108102 pip install cython==0.15.1
109103 ( python setup.py build_ext --inplace && python setup.py develop ) || true
104+
110105else
111- python setup.py build_ext --inplace && python setup.py develop
112- fi
113106
114- for package in beautifulsoup4; do
115- pip uninstall --yes $package
116- done
107+ # build but don't install
108+ time python setup.py build_ext --inplace || exit 1
109+
110+ # we may have run installations
111+ REQ=" ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG} .run"
112+ time conda install -n pandas --file=${REQ} || exit 1
113+
114+ # we may have additional pip installs
115+ REQ=" ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG} .pip"
116+ if [ -e ${REQ} ]; then
117+ pip install -r $REQ
118+ fi
119+
120+ # remove any installed pandas package
121+ conda remove pandas
122+
123+ # install our pandas
124+ python setup.py develop || exit 1
125+
126+ fi
117127
118128true
0 commit comments