Skip to content

Commit 8b463cb

Browse files
author
Carlos Souza
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9fc617b + c80bd19 commit 8b463cb

30 files changed

+93
-85
lines changed

‎.travis.yml‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sudo: false
22
language: python
33

4-
# To turn off cached miniconda, cython files and compiler cache comment out the
5-
# USE_CACHE=true line for the build in the matrix below. To delete caches go to
6-
# https://travis-ci.org/OWNER/REPOSITORY/caches or run
4+
# To turn off cached cython files and compiler cache
5+
# set NOCACHE-true
6+
# To delete caches go to https://travis-ci.org/OWNER/REPOSITORY/caches or run
77
# travis cache --delete inside the project directory from the travis command line client
88
# The cash directories will be deleted if anything in ci/ changes in a commit
99
cache:
@@ -33,31 +33,31 @@ matrix:
3333
- $HOME/.cache # cython cache
3434
- $HOME/.ccache # compiler cache
3535
env:
36-
- PYTHON_VERSION=3.5 JOB_NAME="35_osx" TEST_ARGS="--skip-slow --skip-network" JOB_TAG="_OSX" TRAVIS_PYTHON_VERSION=3.5 USE_CACHE=true
36+
- JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network" TRAVIS_PYTHON_VERSION=3.5
3737
- python: 2.7
3838
env:
39-
- PYTHON_VERSION=2.7 JOB_NAME="27_slow_nnet_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8" JOB_TAG="_LOCALE" USE_CACHE=true
39+
- JOB="2.7_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8"
4040
addons:
4141
apt:
4242
packages:
4343
- language-pack-zh-hans
4444
- python: 2.7
4545
env:
46-
- PYTHON_VERSION=2.7 JOB_NAME="27_nslow" TEST_ARGS="--skip-slow" LINT=true USE_CACHE=true
46+
- JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
4747
addons:
4848
apt:
4949
packages:
5050
- python-gtk2
5151
- python: 3.5
5252
env:
53-
- PYTHON_VERSION=3.5 JOB_NAME="35_nslow" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true USE_CACHE=true
53+
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
5454
addons:
5555
apt:
5656
packages:
5757
- xsel
5858
- python: 3.6
5959
env:
60-
- PYTHON_VERSION=3.6 JOB_NAME="36" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true USE_CACHE=true
60+
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
6161
addons:
6262
apt:
6363
packages:
@@ -66,32 +66,32 @@ matrix:
6666
# In allow_failures
6767
- python: 2.7
6868
env:
69-
- PYTHON_VERSION=2.7 JOB_NAME="27_slow" JOB_TAG="_SLOW" TEST_ARGS="--only-slow --skip-network" USE_CACHE=true
69+
- JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
7070
# In allow_failures
7171
- python: 2.7
7272
env:
73-
- PYTHON_VERSION=2.7 JOB_NAME="27_build_test" JOB_TAG="_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true USE_CACHE=true
73+
- JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
7474
# In allow_failures
75-
- python: 3.5
75+
- python: 3.6
7676
env:
77-
- PYTHON_VERSION=3.5 JOB_NAME="35_numpy_dev" JOB_TAG="_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" USE_CACHE=true
77+
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
7878
# In allow_failures
7979
- python: 3.5
8080
env:
81-
- PYTHON_VERSION=3.5 JOB_NAME="doc_build" DOC_BUILD=true JOB_TAG="_DOC_BUILD" USE_CACHE=true
81+
- JOB="3.5_DOC_BUILD" DOC_BUILD=true
8282
allow_failures:
8383
- python: 2.7
8484
env:
85-
- PYTHON_VERSION=2.7 JOB_NAME="27_slow" JOB_TAG="_SLOW" TEST_ARGS="--only-slow --skip-network" USE_CACHE=true
85+
- JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
8686
- python: 2.7
8787
env:
88-
- PYTHON_VERSION=2.7 JOB_NAME="27_build_test" JOB_TAG="_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true USE_CACHE=true
89-
- python: 3.5
88+
- JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
89+
- python: 3.6
9090
env:
91-
- PYTHON_VERSION=3.5 JOB_NAME="35_numpy_dev" JOB_TAG="_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" USE_CACHE=true
91+
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
9292
- python: 3.5
9393
env:
94-
- PYTHON_VERSION=3.5 JOB_NAME="doc_build" DOC_BUILD=true JOB_TAG="_DOC_BUILD" USE_CACHE=true
94+
- JOB="3.5_DOC_BUILD" DOC_BUILD=true
9595

9696
before_install:
9797
- echo "before_install"
@@ -107,7 +107,6 @@ before_install:
107107

108108
install:
109109
- echo "install start"
110-
- ci/check_cache.sh
111110
- ci/prep_cython_cache.sh
112111
- ci/install_travis.sh
113112
- ci/submit_cython_cache.sh

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ install:
7272
- cmd: conda info -a
7373

7474
# create our env
75-
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% cython pytest
75+
- cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest
7676
- cmd: activate pandas
77-
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
77+
- SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run
7878
- cmd: echo "installing requirements from %REQ%"
79-
- cmd: conda install -n pandas -q --file=%REQ%
79+
- cmd: conda install -n pandas --file=%REQ%
8080
- cmd: conda list -n pandas
8181
- cmd: echo "installing requirements from %REQ% - done"
8282

‎ci/check_cache.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/bin/bash
22

3+
# currently not used
4+
# script to make sure that cache is clean
5+
# Travis CI now handles this
6+
37
if [ "$TRAVIS_PULL_REQUEST" == "false" ]
48
then
59
echo "Not a PR: checking for changes in ci/ from last 2 commits"

‎ci/install_circle.sh‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ echo "[environmental variable file]"
4646
cat $ENVS_FILE
4747
source $ENVS_FILE
4848

49-
export REQ_BUILD=ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build
50-
export REQ_RUN=ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run
51-
export REQ_PIP=ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip
49+
export REQ_BUILD=ci/requirements-${JOB}.build
50+
export REQ_RUN=ci/requirements-${JOB}.run
51+
export REQ_PIP=ci/requirements-${JOB}.pip
5252

5353
# edit the locale override if needed
5454
if [ -n "$LOCALE_OVERRIDE" ]; then
@@ -61,16 +61,13 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
6161
echo
6262
fi
6363

64-
# create new env
65-
echo "[create env]"
66-
time conda create -q -n pandas python=${PYTHON_VERSION} pytest || exit 1
64+
# create envbuild deps
65+
echo "[create env: ${REQ_BUILD}]"
66+
time conda create -n pandas -q --file=${REQ_BUILD} || exit 1
67+
time conda install -n pandas pytest || exit 1
6768

6869
source activate pandas
6970

70-
# build deps
71-
echo "[build installs: ${REQ_BUILD}]"
72-
time conda install -q --file=${REQ_BUILD} || exit 1
73-
7471
# build but don't install
7572
echo "[build em]"
7673
time python setup.py build_ext --inplace || exit 1
@@ -84,5 +81,5 @@ fi
8481
# we may have additional pip installs
8582
echo "[pip installs: ${REQ_PIP}]"
8683
if [ -e ${REQ_PIP} ]; then
87-
pip install -q -r $REQ_PIP
84+
pip install -r $REQ_PIP
8885
fi

‎ci/install_travis.sh‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ conda info -a || exit 1
6868

6969
# set the compiler cache to work
7070
echo
71-
if [ "$USE_CACHE" ] && [ "${TRAVIS_OS_NAME}" == "linux" ]; then
71+
if [ -z "$NOCACHE" ] && [ "${TRAVIS_OS_NAME}" == "linux" ]; then
7272
echo "[Using ccache]"
7373
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
7474
gcc=$(which gcc)
7575
echo "[gcc]: $gcc"
7676
ccache=$(which ccache)
7777
echo "[ccache]: $ccache"
7878
export CC='ccache gcc'
79-
elif [ "$USE_CACHE" ] && [ "${TRAVIS_OS_NAME}" == "osx" ]; then
79+
elif [ -z "$NOCACHE" ] && [ "${TRAVIS_OS_NAME}" == "osx" ]; then
8080
echo "[Using ccache]"
8181
time brew install ccache
8282
export PATH=/usr/local/opt/ccache/libexec:$PATH
@@ -91,35 +91,22 @@ fi
9191
echo
9292
echo "[create env]"
9393

94-
# may have installation instructions for this build
95-
INSTALL="ci/install-${PYTHON_VERSION}${JOB_TAG}.sh"
96-
if [ -e ${INSTALL} ]; then
97-
time bash $INSTALL || exit 1
98-
else
99-
# create new env
100-
# this may already exists, in which case our caching worked
101-
time conda create -n pandas python=$PYTHON_VERSION pytest nomkl
102-
fi
94+
# create our environment
95+
REQ="ci/requirements-${JOB}.build"
96+
time conda create -n pandas --file=${REQ} || exit 1
10397

104-
# build deps
105-
echo
106-
echo "[build installs]"
107-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build"
108-
if [ -e ${REQ} ]; then
109-
time conda install -n pandas --file=${REQ} || exit 1
110-
fi
98+
source activate pandas
11199

112100
# may have addtl installation instructions for this build
113101
echo
114102
echo "[build addtl installs]"
115-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build.sh"
103+
REQ="ci/requirements-${JOB}.build.sh"
116104
if [ -e ${REQ} ]; then
117105
time bash $REQ || exit 1
118106
fi
119107

120-
source activate pandas
121-
122-
pip install pytest-xdist
108+
time conda install -n pandas pytest
109+
time pip install pytest-xdist
123110

124111
if [ "$LINT" ]; then
125112
conda install flake8
@@ -152,23 +139,23 @@ fi
152139
# we may have run installations
153140
echo
154141
echo "[conda installs]"
155-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run"
142+
REQ="ci/requirements-${JOB}.run"
156143
if [ -e ${REQ} ]; then
157144
time conda install -n pandas --file=${REQ} || exit 1
158145
fi
159146

160147
# we may have additional pip installs
161148
echo
162149
echo "[pip installs]"
163-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip"
150+
REQ="ci/requirements-${JOB}.pip"
164151
if [ -e ${REQ} ]; then
165152
pip install -r $REQ
166153
fi
167154

168155
# may have addtl installation instructions for this build
169156
echo
170157
echo "[addtl installs]"
171-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
158+
REQ="ci/requirements-${JOB}.sh"
172159
if [ -e ${REQ} ]; then
173160
time bash $REQ || exit 1
174161
fi

‎ci/prep_cython_cache.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222

2323
home_dir=$(pwd)
2424

25-
if [ -f "$CACHE_File" ] && [ "$USE_CACHE" ] && [ -d "$PYX_CACHE_DIR" ]; then
25+
if [ -f "$CACHE_File" ] && [ -z "$NOCACHE" ] && [ -d "$PYX_CACHE_DIR" ]; then
2626

2727
echo "Cache available - checking pyx diff"
2828

@@ -57,16 +57,16 @@ if [ -f "$CACHE_File" ] && [ "$USE_CACHE" ] && [ -d "$PYX_CACHE_DIR" ]; then
5757

5858
fi
5959

60-
if [ $clear_cache -eq 0 ] && [ "$USE_CACHE" ]
60+
if [ $clear_cache -eq 0 ] && [ -z "$NOCACHE" ]
6161
then
62-
# No and use_cache is set
62+
# No and nocache is not set
6363
echo "Will reuse cached cython file"
6464
cd /
6565
tar xvmf $CACHE_File
6666
cd $home_dir
6767
else
6868
echo "Rebuilding cythonized files"
69-
echo "Use cache (Blank if not set) = $USE_CACHE"
69+
echo "No cache = $NOCACHE"
7070
echo "Clear cache (1=YES) = $clear_cache"
7171
fi
7272

‎ci/requirements-2.7.build‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
python=2.7*
12
python-dateutil=2.4.1
23
pytz=2013b
4+
nomkl
35
numpy
46
cython=0.23

‎ci/requirements-2.7_BUILD_TEST.build‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
python=2.7*
12
dateutil
23
pytz
4+
nomkl
35
numpy
46
cython

‎ci/requirements-2.7_COMPAT.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
python=2.7*
12
numpy=1.7.1
23
cython=0.23
34
dateutil=1.5

‎ci/requirements-2.7_LOCALE.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
python=2.7*
12
python-dateutil
23
pytz=2013b
34
numpy=1.8.2

0 commit comments

Comments
 (0)