Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use conda-env for CI environments #20767

Merged
merged 41 commits into from
Apr 24, 2018
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
02b2879
CI: compat
TomAugspurger Apr 19, 2018
586132d
CI: 27-locale
TomAugspurger Apr 19, 2018
5bcee03
CI: 27
TomAugspurger Apr 19, 2018
8f27bc1
CI: 3.5
TomAugspurger Apr 20, 2018
8d64136
CI: OSX
TomAugspurger Apr 20, 2018
5f985ad
CI: 3.6 slow
TomAugspurger Apr 20, 2018
57eef01
CI: 3.6 NumPy Dev
TomAugspurger Apr 20, 2018
5e9b6aa
DEBUG: show whole environment
TomAugspurger Apr 20, 2018
f040101
CI: 3.6 DOC
TomAugspurger Apr 20, 2018
d08da8f
CI: 3.6
TomAugspurger Apr 20, 2018
c9b4c68
Revert 2.7-compat
TomAugspurger Apr 20, 2018
c86eba5
CI: Revert 3.5
TomAugspurger Apr 20, 2018
5d19822
Updated travis install
TomAugspurger Apr 20, 2018
132e1d8
Include conda-forge for 2.7
TomAugspurger Apr 20, 2018
8071359
Removed markers
TomAugspurger Apr 20, 2018
828b08b
Added quiet to the install
TomAugspurger Apr 20, 2018
65e874a
CI: Removed fastparquet from OSX
TomAugspurger Apr 20, 2018
dce87b5
CI: Circle 27 compat
TomAugspurger Apr 20, 2018
3116c97
CI: circle-36-locale
TomAugspurger Apr 20, 2018
0d4ae51
CI: circle-36-locale_slow
TomAugspurger Apr 20, 2018
480686b
CI: 3.5-ascii
TomAugspurger Apr 20, 2018
692cc27
CI: Remove redundant coverage install
TomAugspurger Apr 20, 2018
2ead1be
CI: updated circle
TomAugspurger Apr 20, 2018
3d29fcc
CI: Appveyor 27
TomAugspurger Apr 20, 2018
7dbd646
CI: appveyor-3.6
TomAugspurger Apr 20, 2018
5cf612d
CI: Updated appveyor
TomAugspurger Apr 20, 2018
444992b
CI: use absolute path to environment file
TomAugspurger Apr 20, 2018
1706d23
Fix filename
TomAugspurger Apr 20, 2018
2de5402
no pip uninstall
TomAugspurger Apr 20, 2018
0f7f0f1
Try setting the exit manually
TomAugspurger Apr 20, 2018
c4771df
Re-add parquet deps to 2.7
TomAugspurger Apr 20, 2018
06edc66
Remove unused motos
TomAugspurger Apr 21, 2018
4161d65
CI: Remove conda-forge from 3.5
TomAugspurger Apr 23, 2018
f70a6dc
remove JOB
TomAugspurger Apr 23, 2018
ec55f9b
Merge remote-tracking branch 'upstream/master' into ci-envs
TomAugspurger Apr 23, 2018
bf60ba2
Removed xfails
TomAugspurger Apr 23, 2018
d8aa12f
Revert "remove JOB"
TomAugspurger Apr 23, 2018
b2e1a5f
Removed unused environment
TomAugspurger Apr 23, 2018
be43dd7
Informative JOB tags
TomAugspurger Apr 23, 2018
cd50adb
BUG: Fixed NDFrame.transform('abs')
TomAugspurger Apr 23, 2018
8b0e277
Revert "BUG: Fixed NDFrame.transform('abs')"
TomAugspurger Apr 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,54 @@ matrix:
- os: osx
language: generic
env:
- JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
- ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network"
- dist: trusty
env:
- JOB="2.7_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
- ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
addons:
apt:
packages:
- language-pack-zh-hans
- dist: trusty
env:
- JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
- ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true
addons:
apt:
packages:
- python-gtk2
# In allow_failures
- dist: trusty
env:
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
- ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
# In allow_failures
- dist: trusty
env:
- JOB="3.6_SLOW" SLOW=true
- ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
# In allow_failures
- dist: trusty
env:
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
- ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
addons:
apt:
packages:
- xsel
# In allow_failures
- dist: trusty
env:
- JOB="3.6_DOC" DOC=true
- ENV_FILE="ci/travis-36-doc.yaml" DOC=true
allow_failures:
- dist: trusty
env:
- JOB="3.6_SLOW" SLOW=true
- ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
- dist: trusty
env:
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
- ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
addons:
apt:
packages:
- xsel
- dist: trusty
env:
- JOB="3.6_DOC" DOC=true
- ENV_FILE="ci/travis-36-doc.yaml" DOC=true

before_install:
- echo "before_install"
Expand Down
15 changes: 4 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,12 @@ install:
- cmd: conda info -a

# create our env
- cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist
- cmd: conda env create -q -n pandas --file=ci\appveyor-%CONDA_PY%.yaml
- cmd: activate pandas
- cmd: pip install moto
- SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run
- cmd: echo "installing requirements from %REQ%"
- cmd: conda install -n pandas --file=%REQ%
- cmd: conda list -n pandas
- cmd: echo "installing requirements from %REQ% - done"

# add some pip only reqs to the env
- SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.pip
- cmd: echo "installing requirements from %REQ%"
- cmd: pip install -Ur %REQ%
# uninstall pandas if it's present
- cmd: conda remove pandas -y --force & exit 0
- cmd: pip uninstall -y pandas & exit 0

# build em using the local source checkout in the correct windows env
- cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace'
Expand Down
29 changes: 29 additions & 0 deletions ci/appveyor-27.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: pandas
channels:
- defaults
- conda-forge
dependencies:
- beautifulsoup4
- bottleneck
- dateutil
- html5lib
- jinja2=2.8
- lxml
- matplotlib
- numexpr
- numpy=1.10*
- openpyxl
- pytables==3.2.2
- python=2.7.*
- pytz
- s3fs
- scipy
- sqlalchemy
- xlrd
- xlsxwriter
- xlwt
# universal
- cython
- pytest
- pytest-xdist
- moto
27 changes: 27 additions & 0 deletions ci/appveyor-36.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: pandas
channels:
- defaults
- conda-forge
dependencies:
- blosc
- bottleneck
- fastparquet
- feather-format
- matplotlib
- numexpr
- numpy=1.13*
- openpyxl
- pyarrow
- pytables
- python-dateutil
- python=3.6.*
- pytz
- scipy
- thrift=0.10*
- xlrd
- xlsxwriter
- xlwt
# universal
- cython
- pytest
- pytest-xdist
28 changes: 28 additions & 0 deletions ci/circle-27-compat.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: pandas
channels:
- defaults
- conda-forge
dependencies:
- bottleneck=1.0.0
- cython=0.24
- jinja2=2.8
- numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr
- numpy=1.9.2
- openpyxl
- psycopg2
- pytables=3.2.2
- python-dateutil=2.5.0
- python=2.7*
- pytz=2013b
- scipy=0.14.0
- sqlalchemy=0.7.8
- xlrd=0.9.2
- xlsxwriter=0.5.2
- xlwt=0.7.5
# universal
- pytest
- pytest-xdist
- pip:
- html5lib==1.0b2
- beautifulsoup4==4.2.1
- pymysql==0.6.0
13 changes: 13 additions & 0 deletions ci/circle-35-ascii.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: pandas
channels:
- defaults
dependencies:
- cython
- nomkl
- numpy
- python-dateutil
- python=3.5*
- pytz
# universal
- pytest
- pytest-xdist
33 changes: 33 additions & 0 deletions ci/circle-36-locale.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: pandas
channels:
- defaults
- conda-forge
dependencies:
- beautifulsoup4
- cython
- html5lib
- ipython
- jinja2
- lxml
- matplotlib
- nomkl
- numexpr
- numpy
- openpyxl
- psycopg2
- pymysql
- pytables
- python-dateutil
- python=3.6*
- pytz
- s3fs
- scipy
- sqlalchemy
- xarray
- xlrd
- xlsxwriter
- xlwt
# universal
- pytest
- pytest-xdist
- moto
33 changes: 33 additions & 0 deletions ci/circle-36-locale_slow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: pandas
channels:
- defaults
- conda-forge
dependencies:
- beautifulsoup4
- cython
- html5lib
- ipython
- jinja2
- lxml
- matplotlib
- nomkl
- numexpr
- numpy
- openpyxl
- psycopg2
- pymysql
- pytables
- python-dateutil
- python=3.6*
- pytz
- s3fs
- scipy
- sqlalchemy
- xarray
- xlrd
- xlsxwriter
- xlwt
# universal
- pytest
- pytest-xdist
- moto
30 changes: 12 additions & 18 deletions ci/install_circle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ echo "[environmental variable file]"
cat $ENVS_FILE
source $ENVS_FILE

export REQ_BUILD=ci/requirements-${JOB}.build
export REQ_RUN=ci/requirements-${JOB}.run
export REQ_PIP=ci/requirements-${JOB}.pip

# edit the locale override if needed
if [ -n "$LOCALE_OVERRIDE" ]; then
echo "[Adding locale to the first line of pandas/__init__.py]"
Expand All @@ -62,25 +58,23 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
fi

# create envbuild deps
echo "[create env: ${REQ_BUILD}]"
time conda create -n pandas -q --file=${REQ_BUILD} || exit 1
time conda install -n pandas pytest>=3.1.0 || exit 1
echo "[create env]"
time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1

source activate pandas
time pip install moto || exit 1

# remove any installed pandas package
# w/o removing anything else
echo
echo "[removing installed pandas]"
conda remove pandas -y --force
pip uninstall -y pandas

# build but don't install
echo "[build em]"
time python setup.py build_ext --inplace || exit 1

# we may have run installations
echo "[conda installs: ${REQ_RUN}]"
if [ -e ${REQ_RUN} ]; then
time conda install -q --file=${REQ_RUN} || exit 1
fi
echo
echo "[show environment]"

# we may have additional pip installs
echo "[pip installs: ${REQ_PIP}]"
if [ -e ${REQ_PIP} ]; then
pip install -r $REQ_PIP
fi
conda list
61 changes: 3 additions & 58 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ conda config --set ssl_verify false || exit 1
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
conda update -q conda

echo
echo "[add channels]"
conda config --remove channels defaults || exit 1
conda config --add channels defaults || exit 1

if [ "$CONDA_FORGE" ]; then
# add conda-forge channel as priority
conda config --add channels conda-forge || exit 1
fi

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

Expand Down Expand Up @@ -90,55 +80,10 @@ echo
echo "[create env]"

# create our environment
REQ="ci/requirements-${JOB}.build"
time conda create -n pandas --file=${REQ} || exit 1
time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1

source activate pandas

# may have addtl installation instructions for this build
echo
echo "[build addtl installs]"
REQ="ci/requirements-${JOB}.build.sh"
if [ -e ${REQ} ]; then
time bash $REQ || exit 1
fi

time conda install -n pandas pytest>=3.1.0
time pip install -q pytest-xdist moto

if [ "$LINT" ]; then
conda install flake8=3.4.1
pip install cpplint
fi

if [ "$COVERAGE" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where did coverage go?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The coverage deps are run on the 3.6 build. travis-36.yaml has the additional coverage deps.

pip install coverage pytest-cov
fi

# we may have run installations
echo
echo "[conda installs]"
REQ="ci/requirements-${JOB}.run"
if [ -e ${REQ} ]; then
time conda install -n pandas --file=${REQ} || exit 1
fi

# we may have additional pip installs
echo
echo "[pip installs]"
REQ="ci/requirements-${JOB}.pip"
if [ -e ${REQ} ]; then
pip install -r $REQ
fi

# may have addtl installation instructions for this build
echo
echo "[addtl installs]"
REQ="ci/requirements-${JOB}.sh"
if [ -e ${REQ} ]; then
time bash $REQ || exit 1
fi

# remove any installed pandas package
# w/o removing anything else
echo
Expand All @@ -156,8 +101,8 @@ echo "[running setup.py develop]"
python setup.py develop || exit 1

echo
echo "[show pandas]"
conda list pandas
echo "[show environment]"
conda list

echo
echo "[done]"
Expand Down
6 changes: 0 additions & 6 deletions ci/requirements-2.7.build

This file was deleted.

Loading