Skip to content

Commit d2bff82

Browse files
committed
Merge remote-tracking branch 'upstream/master' into bitarray-na-int
2 parents 65893ae + aa1549f commit d2bff82

File tree

990 files changed

+93937
-76923
lines changed

Some content is hidden

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

990 files changed

+93937
-76923
lines changed

.coveragerc

-29
This file was deleted.

.github/CONTRIBUTING.md

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
Contributing to pandas
2-
======================
1+
# Contributing to pandas
32

43
Whether you are a novice or experienced software developer, all contributions and suggestions are welcome!
54

6-
Our main contribution docs can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst), but if you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant places in the docs for further information.
5+
Our main contributing guide can be found [in this repo](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst) or [on the website](https://pandas-docs.github.io/pandas-docs-travis/contributing.html). If you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant sections of that document for further information.
6+
7+
## Getting Started
78

8-
Getting Started
9-
---------------
109
If you are looking to contribute to the *pandas* codebase, the best place to start is the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues). This is also a great place for filing bug reports and making suggestions for ways in which we can improve the code and documentation.
1110

12-
If you have additional questions, feel free to ask them on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas). Further information can also be found in our [Getting Started](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#where-to-start) section of our main contribution doc.
11+
If you have additional questions, feel free to ask them on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas). Further information can also be found in the "[Where to start?](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#where-to-start)" section.
12+
13+
## Filing Issues
14+
15+
If you notice a bug in the code or documentation, or have suggestions for how we can improve either, feel free to create an issue on the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) using [GitHub's "issue" form](https://github.com/pandas-dev/pandas/issues/new). The form contains some questions that will help us best address your issue. For more information regarding how to file issues against *pandas*, please refer to the "[Bug reports and enhancement requests](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#bug-reports-and-enhancement-requests)" section.
1316

14-
Filing Issues
15-
-------------
16-
If you notice a bug in the code or in docs or have suggestions for how we can improve either, feel free to create an issue on the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) using [GitHub's "issue" form](https://github.com/pandas-dev/pandas/issues/new). The form contains some questions that will help us best address your issue. For more information regarding how to file issues against *pandas*, please refer to the [Bug reports and enhancement requests](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#bug-reports-and-enhancement-requests) section of our main contribution doc.
17+
## Contributing to the Codebase
1718

18-
Contributing to the Codebase
19-
----------------------------
20-
The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas), so you will need to use [Git](http://git-scm.com/) to clone the project and make changes to the codebase. Once you have obtained a copy of the code, you should create a development environment that is separate from your existing Python environment so that you can make and test changes without compromising your own work environment. For more information, please refer to our [Working with the code](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#working-with-the-code) section of our main contribution docs.
19+
The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas), so you will need to use [Git](http://git-scm.com/) to clone the project and make changes to the codebase. Once you have obtained a copy of the code, you should create a development environment that is separate from your existing Python environment so that you can make and test changes without compromising your own work environment. For more information, please refer to the "[Working with the code](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#working-with-the-code)" section.
2120

22-
Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#test-driven-development-code-writing). We also have guidelines regarding coding style that will be enforced during testing. Details about coding style can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#code-standards).
21+
Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites in the "[Test-driven development/code writing](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#test-driven-development-code-writing)" section. We also have guidelines regarding coding style that will be enforced during testing, which can be found in the "[Code standards](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#code-standards)" section.
2322

24-
Once your changes are ready to be submitted, make sure to push your changes to GitHub before creating a pull request. Details about how to do that can be found in the [Contributing your changes to pandas](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#contributing-your-changes-to-pandas) section of our main contribution docs. We will review your changes, and you will most likely be asked to make additional changes before it is finally ready to merge. However, once it's ready, we will merge it, and you will have successfully contributed to the codebase!
23+
Once your changes are ready to be submitted, make sure to push your changes to GitHub before creating a pull request. Details about how to do that can be found in the "[Contributing your changes to pandas](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#contributing-your-changes-to-pandas)" section. We will review your changes, and you will most likely be asked to make additional changes before it is finally ready to merge. However, once it's ready, we will merge it, and you will have successfully contributed to the codebase!

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ dist
6262
coverage.xml
6363
coverage_html_report
6464
*.pytest_cache
65+
# hypothesis test database
66+
.hypothesis/
6567

6668
# OS generated files #
6769
######################
@@ -107,6 +109,5 @@ doc/build/html/index.html
107109
# Windows specific leftover:
108110
doc/tmp.sv
109111
doc/source/styled.xlsx
110-
doc/source/templates/
111112
env/
112113
doc/source/savefig/

.pep8speaks.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
scanner:
44
diff_only: True # If True, errors caused by only the patch are shown
55

6+
# Opened issue in pep8speaks, so we can directly use the config in setup.cfg
7+
# (and avoid having to duplicate it here):
8+
# https://github.com/OrkoHunter/pep8speaks/issues/95
9+
610
pycodestyle:
711
max-line-length: 79
8-
ignore: # Errors and warnings to ignore
12+
ignore:
13+
- W503, # line break before binary operator
14+
- W504, # line break after binary operator
915
- E402, # module level import not at top of file
1016
- E731, # do not assign a lambda expression, use a def
11-
- E741, # do not use variables named 'l', 'O', or 'I'
12-
- W503 # line break before binary operator
17+
- C406, # Unnecessary list literal - rewrite as a dict literal.
18+
- C408, # Unnecessary dict call - rewrite as a literal.
19+
- C409 # Unnecessary list passed to tuple() - rewrite as a tuple literal.

.travis.yml

+35-39
Original file line numberDiff line numberDiff line change
@@ -23,70 +23,67 @@ env:
2323

2424
git:
2525
# for cloning
26-
depth: 1000
26+
depth: 1500
2727

2828
matrix:
2929
fast_finish: true
3030
exclude:
3131
# Exclude the default Python 3.5 build
3232
- python: 3.5
33-
include:
34-
- os: osx
35-
language: generic
36-
env:
37-
- JOB="3.5, OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network"
3833

34+
include:
3935
- dist: trusty
4036
env:
41-
- JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network"
37+
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network"
4238

4339
- dist: trusty
4440
env:
45-
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
41+
- JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" PATTERN="slow"
4642
addons:
4743
apt:
4844
packages:
4945
- language-pack-zh-hans
46+
5047
- dist: trusty
5148
env:
52-
- JOB="2.7, lint" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true
49+
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow"
5350
addons:
5451
apt:
5552
packages:
5653
- python-gtk2
54+
5755
- dist: trusty
5856
env:
59-
- JOB="3.6, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
60-
# In allow_failures
57+
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="not slow and not network" LOCALE_OVERRIDE="zh_CN.UTF-8"
58+
6159
- dist: trusty
6260
env:
63-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
64-
# In allow_failures
61+
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
62+
6563
- dist: trusty
6664
env:
67-
- JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
65+
- JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" PATTERN="not slow and not network" TEST_ARGS="-W error" PANDAS_TESTING_MODE="deprecate"
6866
addons:
6967
apt:
7068
packages:
7169
- xsel
70+
71+
# In allow_failures
72+
- dist: trusty
73+
env:
74+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
75+
7276
# In allow_failures
7377
- dist: trusty
7478
env:
75-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
79+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
7680
allow_failures:
7781
- dist: trusty
7882
env:
79-
- JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
80-
- dist: trusty
81-
env:
82-
- JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
83-
addons:
84-
apt:
85-
packages:
86-
- xsel
83+
- JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
8784
- dist: trusty
8885
env:
89-
- JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
86+
- JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
9087

9188
before_install:
9289
- echo "before_install"
@@ -100,6 +97,12 @@ before_install:
10097
- uname -a
10198
- git --version
10299
- git tag
100+
# Because travis runs on Google Cloud and has a /etc/boto.cfg,
101+
# it breaks moto import, see:
102+
# https://github.com/spulec/moto/issues/1771
103+
# https://github.com/boto/boto/issues/3741
104+
# This overrides travis and tells it to look nowhere.
105+
- export BOTO_CONFIG=/dev/null
103106

104107
install:
105108
- echo "install start"
@@ -115,24 +118,17 @@ before_script:
115118

116119
script:
117120
- echo "script start"
118-
- ci/run_build_docs.sh
119-
- ci/script_single.sh
120-
- ci/script_multi.sh
121-
- ci/lint.sh
122-
- echo "checking imports"
123-
- source activate pandas && python ci/check_imports.py
124-
- echo "script done"
125-
126-
after_success:
127-
- ci/upload_coverage.sh
121+
- source activate pandas-dev
122+
- ci/build_docs.sh
123+
- ci/run_tests.sh
128124

129125
after_script:
130126
- echo "after_script start"
131-
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
132-
- if [ -e /tmp/single.xml ]; then
133-
ci/print_skipped.py /tmp/single.xml;
127+
- source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
128+
- if [ -e test-data-single.xml ]; then
129+
ci/print_skipped.py test-data-single.xml;
134130
fi
135-
- if [ -e /tmp/multiple.xml ]; then
136-
ci/print_skipped.py /tmp/multiple.xml;
131+
- if [ -e test-data-multiple.xml ]; then
132+
ci/print_skipped.py test-data-multiple.xml;
137133
fi
138134
- echo "after_script done"

LICENSES/MUSL_LICENSE

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
musl as a whole is licensed under the following standard MIT license:
2+
3+
----------------------------------------------------------------------
4+
Copyright © 2005-2014 Rich Felker, et al.
5+
6+
Permission is hereby granted, free of charge, to any person obtaining
7+
a copy of this software and associated documentation files (the
8+
"Software"), to deal in the Software without restriction, including
9+
without limitation the rights to use, copy, modify, merge, publish,
10+
distribute, sublicense, and/or sell copies of the Software, and to
11+
permit persons to whom the Software is furnished to do so, subject to
12+
the following conditions:
13+
14+
The above copyright notice and this permission notice shall be
15+
included in all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24+
----------------------------------------------------------------------
25+
26+
Authors/contributors include:
27+
28+
Anthony G. Basile
29+
Arvid Picciani
30+
Bobby Bingham
31+
Boris Brezillon
32+
Brent Cook
33+
Chris Spiegel
34+
Clément Vasseur
35+
Emil Renner Berthing
36+
Hiltjo Posthuma
37+
Isaac Dunham
38+
Jens Gustedt
39+
Jeremy Huntwork
40+
John Spencer
41+
Justin Cormack
42+
Luca Barbato
43+
Luka Perkov
44+
M Farkas-Dyck (Strake)
45+
Michael Forney
46+
Nicholas J. Kain
47+
orc
48+
Pascal Cuoq
49+
Pierre Carrier
50+
Rich Felker
51+
Richard Pennington
52+
sin
53+
Solar Designer
54+
Stefan Kristiansson
55+
Szabolcs Nagy
56+
Timo Teräs
57+
Valentin Ochs
58+
William Haddon
59+
60+
Portions of this software are derived from third-party works licensed
61+
under terms compatible with the above MIT license:
62+
63+
The TRE regular expression implementation (src/regex/reg* and
64+
src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
65+
under a 2-clause BSD license (license text in the source files). The
66+
included version has been heavily modified by Rich Felker in 2012, in
67+
the interests of size, simplicity, and namespace cleanliness.
68+
69+
Much of the math library code (src/math/* and src/complex/*) is
70+
Copyright © 1993,2004 Sun Microsystems or
71+
Copyright © 2003-2011 David Schultz or
72+
Copyright © 2003-2009 Steven G. Kargl or
73+
Copyright © 2003-2009 Bruce D. Evans or
74+
Copyright © 2008 Stephen L. Moshier
75+
and labelled as such in comments in the individual source files. All
76+
have been licensed under extremely permissive terms.
77+
78+
The ARM memcpy code (src/string/armel/memcpy.s) is Copyright © 2008
79+
The Android Open Source Project and is licensed under a two-clause BSD
80+
license. It was taken from Bionic libc, used on Android.
81+
82+
The implementation of DES for crypt (src/misc/crypt_des.c) is
83+
Copyright © 1994 David Burren. It is licensed under a BSD license.
84+
85+
The implementation of blowfish crypt (src/misc/crypt_blowfish.c) was
86+
originally written by Solar Designer and placed into the public
87+
domain. The code also comes with a fallback permissive license for use
88+
in jurisdictions that may not recognize the public domain.
89+
90+
The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
91+
Valentin Ochs and is licensed under an MIT-style license.
92+
93+
The BSD PRNG implementation (src/prng/random.c) and XSI search API
94+
(src/search/*.c) functions are Copyright © 2011 Szabolcs Nagy and
95+
licensed under following terms: "Permission to use, copy, modify,
96+
and/or distribute this code for any purpose with or without fee is
97+
hereby granted. There is no warranty."
98+
99+
The x86_64 port was written by Nicholas J. Kain. Several files (crt)
100+
were released into the public domain; others are licensed under the
101+
standard MIT license terms at the top of this file. See individual
102+
files for their copyright status.
103+
104+
The mips and microblaze ports were originally written by Richard
105+
Pennington for use in the ellcc project. The original code was adapted
106+
by Rich Felker for build system and code conventions during upstream
107+
integration. It is licensed under the standard MIT terms.
108+
109+
The powerpc port was also originally written by Richard Pennington,
110+
and later supplemented and integrated by John Spencer. It is licensed
111+
under the standard MIT terms.
112+
113+
All other files which have no copyright comments are original works
114+
produced specifically for use as part of this library, written either
115+
by Rich Felker, the main author of the library, or by one or more
116+
contibutors listed above. Details on authorship of individual files
117+
can be found in the git version control history of the project. The
118+
omission of copyright and license comments in each file is in the
119+
interest of source tree size.
120+
121+
All public header files (include/* and arch/*/bits/*) should be
122+
treated as Public Domain as they intentionally contain no content
123+
which can be covered by copyright. Some source modules may fall in
124+
this category as well. If you believe that a file is so trivial that
125+
it should be in the Public Domain, please contact the authors and
126+
request an explicit statement releasing it from copyright.
127+
128+
The following files are trivial, believed not to be copyrightable in
129+
the first place, and hereby explicitly released to the Public Domain:
130+
131+
All public headers: include/*, arch/*/bits/*
132+
Startup files: crt/*

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build: clean_pyc
1313
python setup.py build_ext --inplace
1414

1515
lint-diff:
16-
git diff master --name-only -- "*.py" | grep "pandas" | xargs flake8
16+
git diff upstream/master --name-only -- "*.py" | xargs flake8
1717

1818
develop: build
1919
-python setup.py develop

0 commit comments

Comments
 (0)