Skip to content

Commit c4e088a

Browse files
committed
TST: separate conda install from nox use
1 parent 1c8def7 commit c4e088a

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

.travis.yml

+21-23
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,35 @@ before_install:
1313
- source ci/travis_process_gbq_encryption.sh
1414

1515
install:
16-
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
17-
- bash miniconda.sh -b -p $HOME/miniconda
18-
- export PATH="$HOME/miniconda/bin:$PATH"
19-
- hash -r
20-
- conda config --set always_yes yes --set changeps1 no
21-
- conda config --add channels pandas
22-
- conda config --add channels conda-forge
23-
- conda update -q conda
24-
- conda info -a
25-
- conda create -q -n test-environment python=$PYTHON
26-
- source activate test-environment
27-
- if [[ "$PANDAS" == "MASTER" ]]; then
28-
conda install -q numpy pytz python-dateutil;
29-
else
30-
conda install -q pandas=$PANDAS;
31-
fi
32-
- pip install --upgrade pip setuptools
33-
- pip install --upgrade nox-automation
3416
- REQ="ci/requirements-${PYTHON}-${PANDAS}"
35-
- if [ -f "$REQ.pip" ]; then
36-
pip install -r "$REQ.pip";
17+
if [ -f "$REQ.pip" ]; then
18+
pip install --upgrade nox-automation
3719
else
20+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
21+
bash miniconda.sh -b -p $HOME/miniconda
22+
export PATH="$HOME/miniconda/bin:$PATH"
23+
hash -r
24+
conda config --set always_yes yes --set changeps1 no
25+
conda config --add channels pandas
26+
conda config --add channels conda-forge
27+
conda update -q conda
28+
conda info -a
29+
conda create -q -n test-environment python=$PYTHON
30+
source activate test-environment
31+
conda install -q pandas=$PANDAS;
32+
pip install coverage pytest pytest-cov flake8 codecov
3833
conda install -q --file "$REQ.conda";
34+
conda list
35+
python setup.py install
3936
fi
40-
- conda list
41-
- python setup.py install
4237

4338
script:
4439
- if [[ $PYTHON == '2.7' ]]; then nox -s test27 ; fi
4540
- if [[ $PYTHON == '3.5' ]]; then nox -s test35 ; fi
4641
- if [[ $PYTHON == '3.6' ]] && [[ "$PANDAS" == "MASTER" ]]; then nox -s test36master ; fi
47-
- if [ -f "$REQ.conda" ]; then pip install coverage pytest pytest-cov codecov ; pytest -v --cov=pandas_gbq --cov-report xml:/tmp/pytest-cov.xml pandas_gbq ; fi
42+
- if [ -f "$REQ.conda" ]; then
43+
pip install coverage pytest pytest-cov codecov ;
44+
pytest -v --cov=pandas_gbq --cov-report xml:/tmp/pytest-cov.xml pandas_gbq ;
45+
fi
4846
- if [[ $COVERAGE == 'true' ]]; then nox -s coverage ; fi
4947
- if [[ $LINT == 'true' ]]; then nox -s lint ; fi

0 commit comments

Comments
 (0)