Skip to content

Commit be15f0d

Browse files
committed
Merge commit 'v0.18.0-114-g6c692ae' into debian
* commit 'v0.18.0-114-g6c692ae': (492 commits) BUG: add names parameter to read_excel BUG, DEP, DOC: Patch and Align Categorical's Sorting API TST: remove ResourceWarnings from stat by auto-closing iterator TST: revert some testing additions in pandas-dev#12874, xref pandas-dev#12886 DOC: v0.18.1 corrections BUG: Respect usecols even with empty data PERF: Only do case sensitive check when not lower case BUG: PeriodIndex count & resample-on-same-freq fix DOC: add windows building blog to contributing.rst COMPAT: .query/.eval should work w/o numexpr being installed if possible Implement Akima1DInterpolator DOC: fix code-block ipython highlighting BUG:fixed inconsistent behavior of last_valid_index ENH: Add Index.str.get_dummies TST: Add more Sparse indexing tests ENH: Support CustomBusinessHour BUG: ensure coercing scalars to when setting as numpy BUG: SparseSeries slicing with Ellipsis raises KeyError TST: Add numeric coercion tests BUG: .str methods with expand=True may raise ValueError if input has name ...
2 parents b4d2c05 + 6c692ae commit be15f0d

File tree

509 files changed

+113776
-84542
lines changed

Some content is hidden

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

509 files changed

+113776
-84542
lines changed

.coveragerc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# .coveragerc to control coverage.py
22
[run]
33
branch = False
4+
omit = */tests/*
45

56
[report]
67
# Regexes for lines to exclude from consideration
@@ -23,4 +24,4 @@ exclude_lines =
2324
ignore_errors = False
2425

2526
[html]
26-
directory = coverage_html_report
27+
directory = coverage_html_report
File renamed without changes.

.github/ISSUE_TEMPLATE.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#### Code Sample, a copy-pastable example if possible
2+
3+
#### Expected Output
4+
5+
#### output of ``pd.show_versions()``
6+

.github/PULL_REQUEST_TEMPLATE.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- [ ] closes #xxxx
2+
- [ ] tests added / passed
3+
- [ ] passes ``git diff upstream/master | flake8 --diff``
4+
- [ ] whatsnew entry

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ dist
4343
# Egg metadata
4444
*.egg-info
4545
.eggs
46+
.pypirc
4647

4748
# tox testing tool
4849
.tox
@@ -66,6 +67,7 @@ Thumbs.db
6667
# Data files #
6768
##############
6869
*.dta
70+
*.xpt
6971
*.h5
7072
pandas/io/*.dat
7173
pandas/io/*.json

.travis.yml

+61-71
Original file line numberDiff line numberDiff line change
@@ -14,177 +14,167 @@ env:
1414

1515
git:
1616
# for cloning
17-
depth: 100
17+
depth: 300
1818

1919
matrix:
2020
fast_finish: true
2121
include:
22-
- python: 2.6
22+
- language: objective-c
23+
os: osx
24+
compiler: clang
25+
osx_image: xcode6.4
2326
env:
24-
- JOB_NAME: "26_nslow_nnet"
25-
- NOSE_ARGS="not slow and not network and not disabled"
26-
- CLIPBOARD=xclip
27-
- LOCALE_OVERRIDE="it_IT.UTF-8"
28-
- BUILD_TYPE=conda
29-
- INSTALL_TEST=true
27+
- JOB_NAME: "35_osx"
28+
- NOSE_ARGS="not slow and not network and not disabled"
29+
- BUILD_TYPE=conda
30+
- JOB_TAG=_OSX
31+
- TRAVIS_PYTHON_VERSION=3.5
3032
- python: 2.7
3133
env:
3234
- JOB_NAME: "27_slow_nnet_LOCALE"
3335
- NOSE_ARGS="slow and not network and not disabled"
3436
- LOCALE_OVERRIDE="zh_CN.GB18030"
3537
- FULL_DEPS=true
3638
- JOB_TAG=_LOCALE
37-
- BUILD_TYPE=conda
3839
- python: 2.7
3940
env:
4041
- JOB_NAME: "27_nslow"
4142
- NOSE_ARGS="not slow and not disabled"
4243
- FULL_DEPS=true
4344
- CLIPBOARD_GUI=gtk2
44-
- BUILD_TYPE=conda
45-
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
45+
- LINT=true
4646
- python: 3.4
4747
env:
4848
- JOB_NAME: "34_nslow"
4949
- NOSE_ARGS="not slow and not disabled"
5050
- FULL_DEPS=true
5151
- CLIPBOARD=xsel
52-
- BUILD_TYPE=conda
5352
- python: 3.5
5453
env:
5554
- JOB_NAME: "35_nslow"
5655
- NOSE_ARGS="not slow and not network and not disabled"
5756
- FULL_DEPS=true
5857
- CLIPBOARD=xsel
59-
- 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
58+
- COVERAGE=true
6759
- python: 2.7
6860
env:
6961
- JOB_NAME: "27_slow"
7062
- JOB_TAG=_SLOW
7163
- NOSE_ARGS="slow and not network and not disabled"
7264
- FULL_DEPS=true
73-
- BUILD_TYPE=conda
7465
- python: 3.4
7566
env:
7667
- JOB_NAME: "34_slow"
7768
- JOB_TAG=_SLOW
7869
- NOSE_ARGS="slow and not network and not disabled"
7970
- FULL_DEPS=true
8071
- CLIPBOARD=xsel
81-
- BUILD_TYPE=conda
8272
- python: 2.7
8373
env:
8474
- JOB_NAME: "27_build_test_conda"
8575
- JOB_TAG=_BUILD_TEST
8676
- NOSE_ARGS="not slow and not disabled"
8777
- FULL_DEPS=true
88-
- BUILD_TYPE=conda
8978
- BUILD_TEST=true
90-
- python: 2.7
79+
- python: 3.5
9180
env:
92-
- JOB_NAME: "27_build_test_pydata"
93-
- JOB_TAG=_BUILD_TEST
94-
- NOSE_ARGS="not slow and not disabled"
95-
- FULL_DEPS=true
96-
- BUILD_TYPE=pydata
97-
- BUILD_TEST=true
81+
- JOB_NAME: "35_numpy_dev"
82+
- JOB_TAG=_NUMPY_DEV
83+
- NOSE_ARGS="not slow and not network and not disabled"
84+
- PANDAS_TESTING_MODE="deprecate"
9885
- python: 2.7
9986
env:
100-
- JOB_NAME: "27_numpy_master"
101-
- JOB_TAG=_NUMPY_DEV_master
87+
- JOB_NAME: "27_nslow_nnet_COMPAT"
10288
- NOSE_ARGS="not slow and not network and not disabled"
103-
- NUMPY_BUILD=master
104-
- BUILD_TYPE=pydata
105-
- PANDAS_TESTING_MODE="deprecate"
89+
- LOCALE_OVERRIDE="it_IT.UTF-8"
90+
- INSTALL_TEST=true
91+
- JOB_TAG=_COMPAT
92+
- python: 2.7
93+
env:
94+
- JOB_NAME: "doc_build"
95+
- FULL_DEPS=true
96+
- DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
97+
- JOB_TAG=_DOC_BUILD
10698
allow_failures:
107-
- python: 3.3
108-
env:
109-
- JOB_NAME: "33_nslow"
110-
- NOSE_ARGS="not slow and not disabled"
111-
- FULL_DEPS=true
112-
- CLIPBOARD=xsel
113-
- BUILD_TYPE=conda
11499
- python: 2.7
115100
env:
116101
- JOB_NAME: "27_slow"
117102
- JOB_TAG=_SLOW
118103
- NOSE_ARGS="slow and not network and not disabled"
119104
- FULL_DEPS=true
120-
- BUILD_TYPE=conda
121105
- python: 3.4
122106
env:
123107
- JOB_NAME: "34_slow"
124108
- JOB_TAG=_SLOW
125109
- NOSE_ARGS="slow and not network and not disabled"
126110
- FULL_DEPS=true
127111
- CLIPBOARD=xsel
128-
- BUILD_TYPE=conda
129-
- python: 2.7
130-
env:
131-
- JOB_NAME: "27_numpy_master"
132-
- JOB_TAG=_NUMPY_DEV_master
133-
- NOSE_ARGS="not slow and not network and not disabled"
134-
- NUMPY_BUILD=master
135-
- BUILD_TYPE=pydata
136-
- PANDAS_TESTING_MODE="deprecate"
137112
- python: 2.7
138113
env:
139114
- JOB_NAME: "27_build_test_conda"
140115
- JOB_TAG=_BUILD_TEST
141116
- NOSE_ARGS="not slow and not disabled"
142117
- FULL_DEPS=true
143-
- BUILD_TYPE=conda
144118
- BUILD_TEST=true
119+
- python: 3.5
120+
env:
121+
- JOB_NAME: "35_numpy_dev"
122+
- JOB_TAG=_NUMPY_DEV
123+
- NOSE_ARGS="not slow and not network and not disabled"
124+
- PANDAS_TESTING_MODE="deprecate"
145125
- python: 2.7
146126
env:
147-
- JOB_NAME: "27_build_test_pydata"
148-
- JOB_TAG=_BUILD_TEST
149-
- NOSE_ARGS="not slow and not disabled"
127+
- JOB_NAME: "27_nslow_nnet_COMPAT"
128+
- NOSE_ARGS="not slow and not network and not disabled"
129+
- LOCALE_OVERRIDE="it_IT.UTF-8"
130+
- INSTALL_TEST=true
131+
- JOB_TAG=_COMPAT
132+
- python: 2.7
133+
env:
134+
- JOB_NAME: "doc_build"
150135
- FULL_DEPS=true
151-
- BUILD_TYPE=pydata
152-
- BUILD_TEST=true
136+
- DOC_BUILD=true
137+
- JOB_TAG=_DOC_BUILD
153138

154139
before_install:
155140
- echo "before_install"
156141
- echo $VIRTUAL_ENV
157142
- export PATH="$HOME/miniconda/bin:$PATH"
158-
- sudo apt-get install ccache
159143
- df -h
160144
- date
161145
- pwd
162146
- uname -a
163147
- python -V
164-
- ci/before_install.sh
165-
# Xvfb stuff for clipboard functionality; see the travis-ci documentation
148+
# git info & get tags
149+
- git --version
150+
- git tag
151+
- ci/before_install_travis.sh
166152
- export DISPLAY=:99.0
167-
- sh -e /etc/init.d/xvfb start
168153

169154
install:
170-
- echo "install"
155+
- echo "install start"
171156
- ci/prep_ccache.sh
172-
- ci/install_${BUILD_TYPE}.sh
157+
- ci/install_travis.sh
173158
- ci/submit_ccache.sh
159+
- echo "install done"
174160

175161
before_script:
176-
- mysql -e 'create database pandas_nosetest;'
177-
- psql -c 'create database pandas_nosetest;' -U postgres
162+
- source activate pandas && pip install codecov
163+
- ci/install_db.sh
178164

179165
script:
180-
- echo "script"
181-
- ci/run_build_docs.sh &
166+
- echo "script start"
167+
- ci/run_build_docs.sh
182168
- ci/script.sh
183-
# nothing here, or failed tests won't fail travis
169+
- ci/lint.sh
170+
- echo "script done"
171+
172+
after_success:
173+
- source activate pandas && codecov
184174

185175
after_script:
176+
- echo "after_script start"
186177
- ci/install_test.sh
187-
- if [ -f /tmp/doc.log ]; then cat /tmp/doc.log; fi
188178
- source activate pandas && ci/print_versions.py
189179
- ci/print_skipped.py /tmp/nosetests.xml
190-
- ci/after_script.sh
180+
- echo "after_script done"

LICENSES/SAS7BDAT_LICENSE

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2015 Jared Hobbs
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of
4+
this software and associated documentation files (the "Software"), to deal in
5+
the Software without restriction, including without limitation the rights to
6+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7+
of the Software, and to permit persons to whom the Software is furnished to do
8+
so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

README.md

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<div align="center">
2+
<img src="http://pandas.pydata.org/_static/pandas_horizontal_web.png"><br>
3+
</div>
4+
5+
-----------------
6+
17
# pandas: powerful Python data analysis toolkit
28

39
<table>
@@ -20,9 +26,20 @@
2026
<td>Build Status</td>
2127
<td>
2228
<a href="https://travis-ci.org/pydata/pandas">
23-
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="build status" />
29+
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="travis build status" />
2430
</a>
2531
</td>
32+
</tr>
33+
<td></td>
34+
<td>
35+
<a href="https://ci.appveyor.com/project/jreback/pandas-465">
36+
<img src="https://ci.appveyor.com/api/projects/status/iblk29s98quexwxi/branch/master?svg=true" alt="appveyor build status" />
37+
</a>
38+
</td>
39+
</tr>
40+
<tr>
41+
<td>Coverage</td>
42+
<td><img src="https://codecov.io/github/pydata/pandas/coverage.svg?branch=master" alt="coverage" /></td>
2643
</tr>
2744
<tr>
2845
<td>Conda</td>

0 commit comments

Comments
 (0)