Skip to content

Commit cdbb0ff

Browse files
yarikopticyarikoptic
committed
Merge commit 'v0.17.0rc1-92-gc6bcc99' into debian
* commit 'v0.17.0rc1-92-gc6bcc99': (29 commits) CI: tests latest versions of openpyxl COMPAT: openpyxl >= 2.2 support, pandas-dev#10125 Tests demonstrating how to use sqlalchemy.text() objects in read_sql() TST: Capture warnings in _check_plot_works COMPAT/BUG: color handling in scatter COMPAT: Support for matplotlib 1.5 ERR/API: Raise NotImplementedError when Panel operator function is not implemented, pandas-dev#7692 DOC: minor doc formatting fixes PERF: nested dict DataFrame construction DEPR: deprecate SparsePanel BLD: dateutil->python-dateutil in conda recipe BUG/API: GH11086 where freq is not inferred if both freq is None ENH: add merge indicator to DataFrame.merge PERF: improves performance in groupby.size BUG: DatetimeTZBlock.fillna raises TypeError PERF: infer_datetime_format without padding pandas-dev#11142 PERF: improves performance in SeriesGroupBy.transform TST: Verify fix for buffer overflow in read_csv with engine='c' (GH pandas-dev#9735) DEPR: Series.is_timeseries BUG: nested construction with timedelta pandas-dev#11129 ...
2 parents 3c764d2 + c6bcc99 commit cdbb0ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1386
-470
lines changed

‎.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ matrix:
4343
- CLIPBOARD_GUI=gtk2
4444
- BUILD_TYPE=conda
4545
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
46-
- python: 3.3
47-
env:
48-
- JOB_NAME: "33_nslow"
49-
- NOSE_ARGS="not slow and not disabled"
50-
- FULL_DEPS=true
51-
- CLIPBOARD=xsel
52-
- BUILD_TYPE=conda
5346
- python: 3.4
5447
env:
5548
- JOB_NAME: "34_nslow"
@@ -64,6 +57,13 @@ matrix:
6457
- FULL_DEPS=true
6558
- CLIPBOARD=xsel
6659
- BUILD_TYPE=conda
60+
- python: 3.3
61+
env:
62+
- JOB_NAME: "33_nslow"
63+
- NOSE_ARGS="not slow and not disabled"
64+
- FULL_DEPS=true
65+
- CLIPBOARD=xsel
66+
- BUILD_TYPE=conda
6767
- python: 2.7
6868
env:
6969
- JOB_NAME: "27_slow"
@@ -104,10 +104,10 @@ matrix:
104104
- BUILD_TYPE=pydata
105105
- PANDAS_TESTING_MODE="deprecate"
106106
allow_failures:
107-
- python: 3.5
107+
- python: 3.3
108108
env:
109-
- JOB_NAME: "35_nslow"
110-
- NOSE_ARGS="not slow and not network and not disabled"
109+
- JOB_NAME: "33_nslow"
110+
- NOSE_ARGS="not slow and not disabled"
111111
- FULL_DEPS=true
112112
- CLIPBOARD=xsel
113113
- BUILD_TYPE=conda

‎ci/install_conda.sh

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,20 @@ bash miniconda.sh -b -p $HOME/miniconda || exit 1
7272

7373
conda config --set always_yes yes --set changeps1 no || exit 1
7474
conda update -q conda || exit 1
75+
conda config --add channels conda-forge || exit 1
7576
conda config --add channels http://conda.binstar.org/pandas || exit 1
7677
conda config --set ssl_verify false || exit 1
7778

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

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
82+
# build deps
83+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build"
84+
time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose || exit 1
85+
time conda install -n pandas --file=${REQ} || exit 1
8786

8887
source activate pandas
8988

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-
9689
# set the compiler cache to work
9790
if [ "$IRON_TOKEN" ]; then
9891
export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
@@ -104,15 +97,33 @@ if [ "$IRON_TOKEN" ]; then
10497
fi
10598

10699
if [ "$BUILD_TEST" ]; then
100+
101+
# build testing
107102
pip uninstall --yes cython
108103
pip install cython==0.15.1
109104
( python setup.py build_ext --inplace && python setup.py develop ) || true
105+
110106
else
111-
python setup.py build_ext --inplace && python setup.py develop
112-
fi
113107

114-
for package in beautifulsoup4; do
115-
pip uninstall --yes $package
116-
done
108+
# build but don't install
109+
time python setup.py build_ext --inplace || exit 1
110+
111+
# we may have run installations
112+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.run"
113+
time conda install -n pandas --file=${REQ} || exit 1
114+
115+
# we may have additional pip installs
116+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
117+
if [ -e ${REQ} ]; then
118+
pip install -r $REQ
119+
fi
120+
121+
# remove any installed pandas package
122+
conda remove pandas
123+
124+
# install our pandas
125+
python setup.py develop || exit 1
126+
127+
fi
117128

118129
true

‎ci/install_pydata.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ fi
9090
# Force virtualenv to accept system_site_packages
9191
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
9292

93-
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
93+
# build deps
94+
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.build
9495

9596
# Need to enable for locale testing. The location of the locale file(s) is
9697
# distro specific. For example, on Arch Linux all of the locales are in a
@@ -147,6 +148,9 @@ else
147148
python setup.py develop
148149
fi
149150

151+
# install the run libs
152+
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.run
153+
150154
# restore cython (if not numpy building)
151155
if [ -z "$NUMPY_BUILD" ]; then
152156
time pip install $PIP_ARGS $(cat ci/requirements-${wheel_box}.txt | grep -i cython)

‎ci/requirements-2.6.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
numpy=1.7.0
2+
cython=0.19.1
3+
dateutil=1.5
4+
pytz=2013b

‎ci/requirements-2.6.pip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
blosc
2+
openpyxl
3+
argparse

‎ci/requirements-2.6.txt renamed to ‎ci/requirements-2.6.run

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
numpy=1.7.0
2-
cython=0.19.1
32
dateutil=1.5
43
pytz=2013b
54
scipy=0.11.0
65
xlwt=0.7.5
76
xlrd=0.9.2
8-
openpyxl=2.0.3
97
statsmodels=0.4.3
108
html5lib=1.0b2
119
beautiful-soup=4.2.0

‎ci/requirements-2.7.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dateutil=2.1
2+
pytz=2013b
3+
numpy=1.7.1
4+
cython=0.19.1

‎ci/requirements-2.7.txt renamed to ‎ci/requirements-2.7.run

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
dateutil=2.1
22
pytz=2013b
3+
numpy=1.7.1
34
xlwt=0.7.5
4-
numpy=1.7.0
5-
cython=0.19.1
65
numexpr=2.2.2
76
pytables=3.0.0
87
matplotlib=1.3.1
@@ -12,11 +11,11 @@ sqlalchemy=0.9.6
1211
lxml=3.2.1
1312
scipy
1413
xlsxwriter=0.4.6
15-
statsmodels
1614
boto=2.36.0
1715
bottleneck=0.8.0
1816
psycopg2=2.5.2
1917
patsy
2018
pymysql=0.6.3
2119
html5lib=1.0b2
2220
beautiful-soup=4.2.1
21+
statsmodels

‎ci/requirements-2.7_32.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ci/requirements-2.7_64.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ci/requirements-2.7_BUILD_TEST.txt renamed to ‎ci/requirements-2.7_BUILD_TEST.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ dateutil
22
pytz
33
numpy
44
cython
5-
nose

‎ci/requirements-2.7_LOCALE.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz=2013b
3+
numpy=1.7.1
4+
cython=0.19.1

‎ci/requirements-2.7_LOCALE.txt renamed to ‎ci/requirements-2.7_LOCALE.run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
python-dateutil
22
pytz=2013b
3+
numpy=1.7.1
34
xlwt=0.7.5
45
openpyxl=1.6.2
56
xlsxwriter=0.4.6
67
xlrd=0.9.2
7-
numpy=1.7.1
8-
cython=0.19.1
98
bottleneck=0.8.0
109
matplotlib=1.2.1
1110
patsy=0.1.0

‎ci/requirements-2.7_NUMPY_DEV_1_8_x.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎ci/requirements-2.7_NUMPY_DEV_master.txt renamed to ‎ci/requirements-2.7_NUMPY_DEV_master.build

File renamed without changes.

‎ci/requirements-2.7_NUMPY_DEV_master.run

Whitespace-only changes.

‎ci/requirements-2.7_SLOW.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-2.7_SLOW.txt renamed to ‎ci/requirements-2.7_SLOW.run

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
python-dateutil
22
pytz
33
numpy
4-
cython
54
matplotlib
65
scipy
76
patsy

‎ci/requirements-3.3.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz=2013b
3+
numpy=1.8.0
4+
cython=0.19.1

‎ci/requirements-3.3.pip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
blosc
2+
openpyxl

‎ci/requirements-3.3.txt renamed to ‎ci/requirements-3.3.run

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
python-dateutil
22
pytz=2013b
3-
openpyxl=1.6.2
3+
numpy=1.8.0
44
xlsxwriter=0.4.6
55
xlrd=0.9.2
6+
xlwt
67
html5lib=1.0b2
7-
numpy=1.8.0
8-
cython=0.19.1
98
numexpr
109
pytables
1110
bottleneck=0.8.0

‎ci/requirements-3.4.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.4_SLOW.txt renamed to ‎ci/requirements-3.4.run

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
python-dateutil
22
pytz
3+
numpy
34
openpyxl
45
xlsxwriter
56
xlrd
67
xlwt
78
html5lib
89
patsy
910
beautiful-soup
10-
numpy
11-
cython
1211
scipy
1312
numexpr
1413
pytables
15-
matplotlib=1.3.1
1614
lxml
1715
sqlalchemy
1816
bottleneck
19-
pymysql
17+
pymysql=0.6.3
2018
psycopg2

‎ci/requirements-3.4_32.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ci/requirements-3.4_64.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ci/requirements-3.4_SLOW.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.4.txt renamed to ‎ci/requirements-3.4_SLOW.run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
python-dateutil
22
pytz
3+
numpy
34
openpyxl
45
xlsxwriter
56
xlrd
67
xlwt
78
html5lib
89
patsy
910
beautiful-soup
10-
numpy
11-
cython
1211
scipy
1312
numexpr
1413
pytables
1514
matplotlib
1615
lxml
1716
sqlalchemy
1817
bottleneck
19-
pymysql==0.6.3
18+
pymysql
2019
psycopg2
20+
statsmodels

‎ci/requirements-3.5.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

‎ci/requirements-3.5.run

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
openpyxl
5+
xlsxwriter
6+
xlrd
7+
xlwt
8+
patsy
9+
scipy
10+
numexpr
11+
pytables
12+
html5lib
13+
lxml
14+
15+
# currently causing some warnings
16+
#sqlalchemy
17+
#pymysql
18+
#psycopg2
19+
20+
# not available from conda
21+
#beautiful-soup
22+
#bottleneck
23+
#matplotlib

‎ci/requirements-3.5.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)