Skip to content

Commit 7af95da

Browse files
Ajay SaxenaAjay Saxena
Ajay Saxena
authored and
Ajay Saxena
committed
merging lastest changes
1 parent ac8ae60 commit 7af95da

23 files changed

+310
-65
lines changed

‎.travis.yml

+50-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ matrix:
3434
compiler: clang
3535
osx_image: xcode6.4
3636
env:
37+
- PYTHON_VERSION=3.5
3738
- JOB_NAME: "35_osx"
3839
- NOSE_ARGS="not slow and not network and not disabled"
3940
- BUILD_TYPE=conda
@@ -43,6 +44,7 @@ matrix:
4344
- USE_CACHE=true
4445
- python: 2.7
4546
env:
47+
- PYTHON_VERSION=2.7
4648
- JOB_NAME: "27_slow_nnet_LOCALE"
4749
- NOSE_ARGS="slow and not network and not disabled"
4850
- LOCALE_OVERRIDE="zh_CN.UTF-8"
@@ -56,6 +58,7 @@ matrix:
5658
- language-pack-zh-hans
5759
- python: 2.7
5860
env:
61+
- PYTHON_VERSION=2.7
5962
- JOB_NAME: "27_nslow"
6063
- NOSE_ARGS="not slow and not disabled"
6164
- FULL_DEPS=true
@@ -69,6 +72,7 @@ matrix:
6972
- python-gtk2
7073
- python: 3.4
7174
env:
75+
- PYTHON_VERSION=3.4
7276
- JOB_NAME: "34_nslow"
7377
- NOSE_ARGS="not slow and not disabled"
7478
- FULL_DEPS=true
@@ -81,6 +85,7 @@ matrix:
8185
- xsel
8286
- python: 3.5
8387
env:
88+
- PYTHON_VERSION=3.5
8489
- JOB_NAME: "35_nslow"
8590
- NOSE_ARGS="not slow and not network and not disabled"
8691
- FULL_DEPS=true
@@ -95,6 +100,7 @@ matrix:
95100
# In allow_failures
96101
- python: 2.7
97102
env:
103+
- PYTHON_VERSION=2.7
98104
- JOB_NAME: "27_slow"
99105
- JOB_TAG=_SLOW
100106
- NOSE_ARGS="slow and not network and not disabled"
@@ -104,6 +110,7 @@ matrix:
104110
# In allow_failures
105111
- python: 3.4
106112
env:
113+
- PYTHON_VERSION=3.4
107114
- JOB_NAME: "34_slow"
108115
- JOB_TAG=_SLOW
109116
- NOSE_ARGS="slow and not network and not disabled"
@@ -118,16 +125,31 @@ matrix:
118125
# In allow_failures
119126
- python: 2.7
120127
env:
128+
- PYTHON_VERSION=2.7
121129
- JOB_NAME: "27_build_test_conda"
122130
- JOB_TAG=_BUILD_TEST
123131
- NOSE_ARGS="not slow and not disabled"
124132
- FULL_DEPS=true
125133
- BUILD_TEST=true
126134
- CACHE_NAME="27_build_test_conda"
127135
- USE_CACHE=true
136+
# In allow_failures
137+
- python: 3.6-dev
138+
env:
139+
- PYTHON_VERSION=3.6
140+
- JOB_NAME: "36_dev"
141+
- JOB_TAG=_DEV
142+
- NOSE_ARGS="not slow and not network and not disabled"
143+
- PANDAS_TESTING_MODE="deprecate"
144+
addons:
145+
apt:
146+
packages:
147+
- libatlas-base-dev
148+
- gfortran
128149
# In allow_failures
129150
- python: 3.5
130151
env:
152+
- PYTHON_VERSION=3.5
131153
- JOB_NAME: "35_numpy_dev"
132154
- JOB_TAG=_NUMPY_DEV
133155
- NOSE_ARGS="not slow and not network and not disabled"
@@ -142,6 +164,7 @@ matrix:
142164
# In allow_failures
143165
- python: 2.7
144166
env:
167+
- PYTHON_VERSION=2.7
145168
- JOB_NAME: "27_nslow_nnet_COMPAT"
146169
- NOSE_ARGS="not slow and not network and not disabled"
147170
- LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -156,6 +179,7 @@ matrix:
156179
# In allow_failures
157180
- python: 3.5
158181
env:
182+
- PYTHON_VERSION=3.5
159183
- JOB_NAME: "35_ascii"
160184
- JOB_TAG=_ASCII
161185
- NOSE_ARGS="not slow and not network and not disabled"
@@ -165,6 +189,7 @@ matrix:
165189
# In allow_failures
166190
- python: 2.7
167191
env:
192+
- PYTHON_VERSION=2.7
168193
- JOB_NAME: "doc_build"
169194
- FULL_DEPS=true
170195
- DOC_BUILD=true
@@ -174,6 +199,7 @@ matrix:
174199
allow_failures:
175200
- python: 2.7
176201
env:
202+
- PYTHON_VERSION=2.7
177203
- JOB_NAME: "27_slow"
178204
- JOB_TAG=_SLOW
179205
- NOSE_ARGS="slow and not network and not disabled"
@@ -182,6 +208,7 @@ matrix:
182208
- USE_CACHE=true
183209
- python: 3.4
184210
env:
211+
- PYTHON_VERSION=3.4
185212
- JOB_NAME: "34_slow"
186213
- JOB_TAG=_SLOW
187214
- NOSE_ARGS="slow and not network and not disabled"
@@ -195,28 +222,43 @@ matrix:
195222
- xsel
196223
- python: 2.7
197224
env:
225+
- PYTHON_VERSION=2.7
198226
- JOB_NAME: "27_build_test_conda"
199227
- JOB_TAG=_BUILD_TEST
200228
- NOSE_ARGS="not slow and not disabled"
201229
- FULL_DEPS=true
202230
- BUILD_TEST=true
203231
- CACHE_NAME="27_build_test_conda"
204232
- USE_CACHE=true
205-
- python: 3.5
233+
- python: 3.6-dev
206234
env:
207-
- JOB_NAME: "35_numpy_dev"
208-
- JOB_TAG=_NUMPY_DEV
235+
- PYTHON_VERSION=3.6
236+
- JOB_NAME: "36_dev"
237+
- JOB_TAG=_DEV
209238
- NOSE_ARGS="not slow and not network and not disabled"
210239
- PANDAS_TESTING_MODE="deprecate"
211-
- CACHE_NAME="35_numpy_dev"
212-
- USE_CACHE=true
240+
addons:
241+
apt:
242+
packages:
243+
- libatlas-base-dev
244+
- gfortran
245+
- python: 3.5
246+
env:
247+
- PYTHON_VERSION=3.5
248+
- JOB_NAME: "35_numpy_dev"
249+
- JOB_TAG=_NUMPY_DEV
250+
- NOSE_ARGS="not slow and not network and not disabled"
251+
- PANDAS_TESTING_MODE="deprecate"
252+
- CACHE_NAME="35_numpy_dev"
253+
- USE_CACHE=true
213254
addons:
214255
apt:
215256
packages:
216257
- libatlas-base-dev
217258
- gfortran
218259
- python: 2.7
219260
env:
261+
- PYTHON_VERSION=2.7
220262
- JOB_NAME: "27_nslow_nnet_COMPAT"
221263
- NOSE_ARGS="not slow and not network and not disabled"
222264
- LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -230,6 +272,7 @@ matrix:
230272
- language-pack-it
231273
- python: 3.5
232274
env:
275+
- PYTHON_VERSION=3.5
233276
- JOB_NAME: "35_ascii"
234277
- JOB_TAG=_ASCII
235278
- NOSE_ARGS="not slow and not network and not disabled"
@@ -238,6 +281,7 @@ matrix:
238281
- USE_CACHE=true
239282
- python: 2.7
240283
env:
284+
- PYTHON_VERSION=2.7
241285
- JOB_NAME: "doc_build"
242286
- FULL_DEPS=true
243287
- DOC_BUILD=true
@@ -249,7 +293,7 @@ before_install:
249293
- echo "before_install"
250294
- source ci/travis_process_gbq_encryption.sh
251295
- echo $VIRTUAL_ENV
252-
- export PATH="$HOME/miniconda/bin:$PATH"
296+
- export PATH="$HOME/miniconda3/bin:$PATH"
253297
- df -h
254298
- date
255299
- pwd

‎ci/install-2.7_NUMPY_DEV.sh

-18
This file was deleted.

‎ci/install-3.6_DEV.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
echo "install 3.6 dev"
4+
5+
conda config --set add_pip_as_python_dependency false
6+
conda create -n pandas python=3.6 -c conda-forge/label/prerelease
7+
8+
source activate pandas
9+
10+
# ensure we have pip
11+
python -m ensurepip
12+
13+
# install deps
14+
pip3.6 install nose cython numpy pytz python-dateutil
15+
16+
true

‎ci/install_travis.sh

+28-23
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ edit_init
3131
home_dir=$(pwd)
3232
echo "home_dir: [$home_dir]"
3333

34-
python_major_version="${TRAVIS_PYTHON_VERSION:0:1}"
35-
[ "$python_major_version" == "2" ] && python_major_version=""
36-
37-
MINICONDA_DIR="$HOME/miniconda"
34+
MINICONDA_DIR="$HOME/miniconda3"
3835

3936
if [ -d "$MINICONDA_DIR" ] && [ -e "$MINICONDA_DIR/bin/conda" ] && [ "$USE_CACHE" ]; then
4037
echo "Miniconda install already present from cache: $MINICONDA_DIR"
@@ -63,9 +60,9 @@ else
6360
rm -rf "$MINICONDA_DIR"
6461
# install miniconda
6562
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
66-
wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
63+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
6764
else
68-
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
65+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
6966
fi
7067
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
7168

@@ -84,29 +81,33 @@ else
8481

8582
# Useful for debugging any issues with conda
8683
conda info -a || exit 1
87-
88-
time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose coverage flake8 || exit 1
89-
9084
fi
91-
# build deps
92-
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build"
9385

94-
# may have additional installation instructions for this build
95-
INSTALL="ci/install-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.sh"
86+
# may have installation instructions for this build
87+
INSTALL="ci/install-${PYTHON_VERSION}${JOB_TAG}.sh"
9688
if [ -e ${INSTALL} ]; then
9789
time bash $INSTALL || exit 1
90+
else
91+
92+
# create new env
93+
time conda create -n pandas python=$PYTHON_VERSION nose coverage flake8 || exit 1
9894
fi
9995

96+
# build deps
97+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.build"
98+
10099
# install deps
101-
time conda install -n pandas --file=${REQ} || exit 1
100+
if [ -e ${REQ} ]; then
101+
time conda install -n pandas --file=${REQ} || exit 1
102+
fi
102103

103104
source activate pandas
104105

105106
if [ "$BUILD_TEST" ]; then
106107

107108
# build testing
108109
pip uninstall --yes cython
109-
pip install cython==0.15.1
110+
pip install cython==0.19.1
110111
( python setup.py build_ext --inplace && python setup.py develop ) || true
111112

112113
else
@@ -117,14 +118,22 @@ else
117118

118119
# we may have run installations
119120
echo "conda installs"
120-
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.run"
121-
time conda install -n pandas --file=${REQ} || exit 1
121+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run"
122+
if [ -e ${REQ} ]; then
123+
time conda install -n pandas --file=${REQ} || exit 1
124+
fi
122125

123126
# we may have additional pip installs
124127
echo "pip installs"
125-
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
128+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip"
126129
if [ -e ${REQ} ]; then
127-
pip install --upgrade -r $REQ
130+
pip install --upgrade -r $REQ
131+
fi
132+
133+
# may have addtl installation instructions for this build
134+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
135+
if [ -e ${REQ} ]; then
136+
time bash $REQ || exit 1
128137
fi
129138

130139
# remove any installed pandas package
@@ -138,9 +147,5 @@ else
138147

139148
fi
140149

141-
if [ "$JOB_NAME" == "34_slow" ]; then
142-
conda install -c conda-forge/label/rc -c conda-forge matplotlib
143-
fi
144-
145150
echo "done"
146151
exit 0

‎ci/requirements-2.7_NUMPY_DEV.build

-3
This file was deleted.

‎ci/requirements-2.7_NUMPY_DEV.run

-2
This file was deleted.

‎ci/requirements-3.4_SLOW.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
source activate pandas
4+
5+
echo "install 34_slow"
6+
7+
conda install -n pandas -c conda-forge/label/rc -c conda-forge matplotlib

‎ci/install-3.5_NUMPY_DEV.sh renamed to ‎ci/requirements-3.5_NUMPY_DEV.sh

File renamed without changes.

‎doc/source/reshaping.rst

+4
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ Pivot tables
323323

324324
.. _reshaping.pivot:
325325

326+
While ``pivot`` provides general purpose pivoting of DataFrames with various
327+
data types (strings, numerics, etc.), Pandas also provides the ``pivot_table``
328+
function for pivoting with aggregation of numeric data.
329+
326330
The function ``pandas.pivot_table`` can be used to create spreadsheet-style pivot
327331
tables. See the :ref:`cookbook<cookbook.pivot>` for some advanced strategies
328332

‎doc/source/whatsnew/v0.19.2.txt

+23
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,29 @@ Performance Improvements
2323
Bug Fixes
2424
~~~~~~~~~
2525

26+
<<<<<<< HEAD
2627
- compat with ``dateutil==2.6.0`` for testing (:issue:`14621`)
2728
- allow ``nanoseconds`` in ``Timestamp.replace`` kwargs (:issue:`14621`)
2829
- BUG in clipboard (linux, python2) with unicode and separator (:issue:`13747`)
30+
=======
31+
- Compat with ``dateutil==2.6.0``; segfault reported in the testing suite (:issue:`14621`)
32+
- Allow ``nanoseconds`` in ``Timestamp.replace`` as a kwarg (:issue:`14621`)
33+
34+
35+
36+
37+
38+
39+
40+
- Bug in ``pd.cut`` with negative values and a single bin (:issue:`14652`)
41+
- Bug in ``pd.to_numeric`` where a 0 was not unsigned on a ``downcast='unsigned'`` argument (:issue:`14401`)
42+
43+
44+
45+
46+
- Bug in not propogating exceptions in parsing invalid datetimes, noted in python 3.6 (:issue:`14561`)
47+
48+
49+
50+
- Explicit check in ``to_stata`` and ``StataWriter`` for out-of-range values when writing doubles (:issue:`14618`)
51+
>>>>>>> 45543ec22bb01d5c46eff9384491d218cffddd64

0 commit comments

Comments
 (0)