Skip to content

Commit 3510956

Browse files
committed
BLD: make 3.6 use *only* conda-forge channels
1 parent 7c5ebd5 commit 3510956

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ matrix:
8686
- JOB_NAME: "36"
8787
- TEST_ARGS="--skip-slow --skip-network"
8888
- PANDAS_TESTING_MODE="deprecate"
89+
- CONDA_FORGE=true
8990
addons:
9091
apt:
9192
packages:

ci/install_travis.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@ conda config --set ssl_verify false || exit 1
5353
conda config --set always_yes true --set changeps1 false || exit 1
5454
conda update -q conda
5555

56+
echo "[add channels]"
5657
# add the pandas channel to take priority
5758
# to add extra packages
58-
echo "[add channels]"
5959
conda config --add channels pandas || exit 1
6060
conda config --remove channels defaults || exit 1
6161
conda config --add channels defaults || exit 1
6262

63-
conda install anaconda-client
63+
if [ "$CONDA_FORGE" ]; then
64+
# add conda-forge channel as priority
65+
conda config --add channels conda-forge || exit 1
66+
fi
6467

6568
# Useful for debugging any issues with conda
6669
conda info -a || exit 1

ci/requirements-3.6.run

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ html5lib
1414
jinja2
1515
sqlalchemy
1616
pymysql
17+
feather-format
1718
# psycopg2 (not avail on defaults ATM)
1819
beautifulsoup4
1920
s3fs

ci/requirements-3.6.sh

-7
This file was deleted.

0 commit comments

Comments
 (0)