Skip to content

Commit f3a4da0

Browse files
committed
Merge branch 'releases' into debian
* releases: (78 commits) RLS: v0.19.2 DOC: update release notes for 0.19.2 TST: skip gbq upload test as flakey DOC: clean-up v0.19.2 whatsnew DOC: update Pandas Cheat Sheet (GH13202) DOC: Pandas Cheat Sheet TST: matplotlib 2.0 fix in log limits for barplot (GH14808) (pandas-dev#14957) flake8 fix import Remove test - from 0.20.0 PR slipped in PERF: fix getitem unique_check / initialization issue cache and remove boxing (pandas-dev#14931) CLN: Resubmit of GH14700. Fixes GH14554. Errors other than Indexing… Clean up construction of Series with dictionary and datetime index BUG: .fillna() for datetime64 with tz is passing thru floats BUG: Patch read_csv NA values behaviour ENH: merge_asof() has type specializations and can take multiple 'by' parameters (pandas-dev#13936) [Backport pandas-dev#14886] BUG: regression in DataFrame.combine_first with integer columns (GH14687) (pandas-dev#14886) Fixed KDE Plot to drop the missing values (pandas-dev#14820) ENH: merge_asof() has left_index/right_index and left_by/right_by (pandas-dev#14253) (pandas-dev#14531) TST: correct url for test file on s3 (xref pandas-dev#14587) ...
2 parents b818421 + 5f6a820 commit f3a4da0

File tree

153 files changed

+10021
-4592
lines changed

Some content is hidden

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

153 files changed

+10021
-4592
lines changed

.github/CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Where to start?
66

77
All contributions, bug reports, bug fixes, documentation improvements, enhancements and ideas are welcome.
88

9-
If you are simply looking to start working with the *pandas* codebase, navigate to the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [Difficulty Novice](https://github.com/pandas-dev/pandas/issues?q=is%3Aopen+is%3Aissue+label%3A%22Difficulty+Novice%22) where you could start out.
9+
If you are simply looking to start working with the *pandas* codebase, navigate to the [GitHub "issues" tab](https://github.com/pydata/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pydata/pandas/issues?labels=Docs&sort=updated&state=open) and [Difficulty Novice](https://github.com/pydata/pandas/issues?q=is%3Aopen+is%3Aissue+label%3A%22Difficulty+Novice%22) where you could start out.
1010

1111
Or maybe through using *pandas* you have an idea of you own or are looking for something in the documentation and thinking 'this can be improved'...you can do something about it!
1212

@@ -49,7 +49,7 @@ Now that you have an issue you want to fix, enhancement to add, or documentation
4949

5050
To the new user, working with Git is one of the more daunting aspects of contributing to *pandas*. It can very quickly become overwhelming, but sticking to the guidelines below will help keep the process straightforward and mostly trouble free. As always, if you are having difficulties please feel free to ask for help.
5151

52-
The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas). To contribute you will need to sign up for a [free GitHub account](https://github.com/signup/free). We use [Git](http://git-scm.com/) for version control to allow many people to work together on the project.
52+
The code is hosted on [GitHub](https://www.github.com/pydata/pandas). To contribute you will need to sign up for a [free GitHub account](https://github.com/signup/free). We use [Git](http://git-scm.com/) for version control to allow many people to work together on the project.
5353

5454
Some great resources for learning Git:
5555

@@ -63,11 +63,11 @@ Some great resources for learning Git:
6363

6464
### Forking
6565

66-
You will need your own fork to work on the code. Go to the [pandas project page](https://github.com/pandas-dev/pandas) and hit the `Fork` button. You will want to clone your fork to your machine:
66+
You will need your own fork to work on the code. Go to the [pandas project page](https://github.com/pydata/pandas) and hit the `Fork` button. You will want to clone your fork to your machine:
6767

6868
git clone git@github.com:your-user-name/pandas.git pandas-yourname
6969
cd pandas-yourname
70-
git remote add upstream git://github.com/pandas-dev/pandas.git
70+
git remote add upstream git://github.com/pydata/pandas.git
7171

7272
This creates the directory pandas-yourname and connects your repository to the upstream (main project) *pandas* repository.
7373

@@ -268,7 +268,7 @@ and make these changes with:
268268

269269
pep8radius master --diff --in-place
270270

271-
Alternatively, use the [flake8](http://pypi.python.org/pypi/flake8) tool for checking the style of your code. Additional standards are outlined on the [code style wiki page](https://github.com/pandas-dev/pandas/wiki/Code-Style-and-Conventions).
271+
Alternatively, use the [flake8](http://pypi.python.org/pypi/flake8) tool for checking the style of your code. Additional standards are outlined on the [code style wiki page](https://github.com/pydata/pandas/wiki/Code-Style-and-Conventions).
272272

273273
Please try to maintain backward compatibility. *pandas* has lots of users with lots of existing code, so don't break it if at all possible. If you think breakage is required, clearly state why as part of the pull request. Also, be careful when changing method signatures and add deprecation warnings where needed.
274274

@@ -282,7 +282,7 @@ Like many packages, *pandas* uses the [Nose testing system](https://nose.readthe
282282

283283
#### Writing tests
284284

285-
All tests should go into the `tests` subdirectory of the specific package. This folder contains many current examples of tests, and we suggest looking to these for inspiration. If your test requires working with files or network connectivity, there is more information on the [testing page](https://github.com/pandas-dev/pandas/wiki/Testing) of the wiki.
285+
All tests should go into the `tests` subdirectory of the specific package. This folder contains many current examples of tests, and we suggest looking to these for inspiration. If your test requires working with files or network connectivity, there is more information on the [testing page](https://github.com/pydata/pandas/wiki/Testing) of the wiki.
286286

287287
The `pandas.util.testing` module has many special `assert` functions that make it easier to make statements about whether Series or DataFrame objects are equivalent. The easiest way to verify that your code is correct is to explicitly construct the result you expect, then compare the actual result to the expected correct result:
288288

@@ -378,7 +378,7 @@ This will check out the master revision and run the suite on both master and you
378378

379379
You can run specific benchmarks using the `-r` flag, which takes a regular expression.
380380

381-
See the [performance testing wiki](https://github.com/pandas-dev/pandas/wiki/Performance-Testing) for information on how to write a benchmark.
381+
See the [performance testing wiki](https://github.com/pydata/pandas/wiki/Performance-Testing) for information on how to write a benchmark.
382382

383383
### Documenting your code
384384

@@ -390,7 +390,7 @@ If your code is an enhancement, it is most likely necessary to add usage example
390390
.. versionadded:: 0.17.0
391391
```
392392

393-
This will put the text *New in version 0.17.0* wherever you put the sphinx directive. This should also be put in the docstring when adding a new function or method ([example](https://github.com/pandas-dev/pandas/blob/v0.16.2/pandas/core/generic.py#L1959)) or a new keyword argument ([example](https://github.com/pandas-dev/pandas/blob/v0.16.2/pandas/core/frame.py#L1171)).
393+
This will put the text *New in version 0.17.0* wherever you put the sphinx directive. This should also be put in the docstring when adding a new function or method ([example](https://github.com/pydata/pandas/blob/v0.16.2/pandas/core/generic.py#L1959)) or a new keyword argument ([example](https://github.com/pydata/pandas/blob/v0.16.2/pandas/core/frame.py#L1171)).
394394

395395
Contributing your changes to *pandas*
396396
-------------------------------------
@@ -466,8 +466,8 @@ If you added the upstream repository as described above you will see something l
466466

467467
origin git@github.com:yourname/pandas.git (fetch)
468468
origin git@github.com:yourname/pandas.git (push)
469-
upstream git://github.com/pandas-dev/pandas.git (fetch)
470-
upstream git://github.com/pandas-dev/pandas.git (push)
469+
upstream git://github.com/pydata/pandas.git (fetch)
470+
upstream git://github.com/pydata/pandas.git (push)
471471

472472
Now your code is on GitHub, but it is not yet a part of the *pandas* project. For that to happen, a pull request needs to be submitted on GitHub.
473473

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
#### Code Sample, a copy-pastable example if possible
1+
#### A small, complete example of the issue
22

33
```python
44
# Your code here
55

66
```
7-
#### Problem description
8-
9-
[this should explain **why** the current behaviour is a problem and why the expected output is a better solution.]
107

118
#### Expected Output
129

1310
#### Output of ``pd.show_versions()``
1411

1512
<details>
16-
# Paste the output here pd.show_versions() here
13+
# Paste the output here
1714

1815
</details>

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ cache:
1414

1515
env:
1616
global:
17-
18-
# pandas-docs-travis GH
19-
- secure: Oz6cwVu3NetKZ5nKLJ4RQQBbRJE4KF3J5fkVwICJ2SQaE00ng8os4zJRGSkf0g+K1AVJpQ9A1XKG/IOKMBSkGiXBaVR/Qk/5b+QOTjEhgQBd7tdYjBrFfzpn0AIWn+70nAh24pvuGmq5MU9ILUXwNVVM87FF7cJ7efNseveh7Ss=
17+
# scatterci API key
18+
#- secure: "Bx5umgo6WjuGY+5XFa004xjCiX/vq0CyMZ/ETzcs7EIBI1BE/0fIDXOoWhoxbY9HPfdPGlDnDgB9nGqr5wArO2s+BavyKBWg6osZ3dmkfuJPMOWeyCa92EeP+sfKw8e5HSU5MizW9e319wHWOF/xkzdHR7T67Qd5erhv91x4DnQ="
19+
# ironcache API key
20+
#- secure: "e4eEFn9nDQc3Xa5BWYkzfX37jaWVq89XidVX+rcCNEr5OlOImvveeXnF1IzbRXznH4Sv0YsLwUd8RGUWOmyCvkONq/VJeqCHWtTMyfaCIdqSyhIP9Odz8r9ahch+Y0XFepBey92AJHmlnTh+2GjCDgIiqq4fzglojnp56Vg1ojA="
21+
#- secure: "CjmYmY5qEu3KrvMtel6zWFEtMq8ORBeS1S1odJHnjQpbwT1KY2YFZRVlLphfyDQXSz6svKUdeRrCNp65baBzs3DQNA8lIuXGIBYFeJxqVGtYAZZs6+TzBPfJJK798sGOj5RshrOJkFG2rdlWNuTq/XphI0JOrN3nPUkRrdQRpAw="
22+
# pandas-docs-bot GH
23+
- secure: "PCzUFR8CHmw9lH84p4ygnojdF7Z8U5h7YfY0RyT+5K/aiQ1ZTU3ZkDTPI0/rR5FVMxsEEKEQKMcc5fvqW0PeD7Q2wRmluloKgT9w4EVEJ1ppKf7lITPcvZR2QgVOvjv4AfDtibLHFNiaSjzoqyJVjM4igjOu8WTlF3JfZcmOQjQ="
2024

2125
git:
2226
# for cloning

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div align="center">
2-
<img src="https://github.com/pandas-dev/pandas/blob/master/doc/logo/pandas_logo.png"><br>
2+
<img src="https://github.com/pydata/pandas/blob/master/doc/logo/pandas_logo.png"><br>
33
</div>
44

55
-----------------
@@ -25,8 +25,8 @@
2525
<tr>
2626
<td>Build Status</td>
2727
<td>
28-
<a href="https://travis-ci.org/pandas-dev/pandas">
29-
<img src="https://travis-ci.org/pandas-dev/pandas.svg?branch=master" alt="travis build status" />
28+
<a href="https://travis-ci.org/pydata/pandas">
29+
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="travis build status" />
3030
</a>
3131
</td>
3232
</tr>
@@ -39,7 +39,7 @@
3939
</tr>
4040
<tr>
4141
<td>Coverage</td>
42-
<td><img src="https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master" alt="coverage" /></td>
42+
<td><img src="https://codecov.io/github/pydata/pandas/coverage.svg?branch=master" alt="coverage" /></td>
4343
</tr>
4444
<tr>
4545
<td>Conda</td>
@@ -127,7 +127,7 @@ Here are just a few of the things that pandas does well:
127127

128128
## Where to get it
129129
The source code is currently hosted on GitHub at:
130-
http://github.com/pandas-dev/pandas
130+
http://github.com/pydata/pandas
131131

132132
Binary installers for the latest released version are available at the [Python
133133
package index](http://pypi.python.org/pypi/pandas/) and on conda.

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Release Notes
33

44
The list of changes to pandas between each release can be found
55
[here](http://pandas.pydata.org/pandas-docs/stable/whatsnew.html). For full
6-
details, see the commit logs at http://github.com/pandas-dev/pandas.
6+
details, see the commit logs at http://github.com/pydata/pandas.

asv_bench/asv.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"environment_type": "conda",
2222

2323
// the base URL to show a commit for the project.
24-
"show_commit_url": "https://github.com/pandas-dev/pandas/commit/",
24+
"show_commit_url": "https://github.com/pydata/pandas/commit/",
2525

2626
// The Pythons you'd like to test against. If not provided, defaults
2727
// to the current version of Python used to run `asv`.

asv_bench/benchmarks/algorithms.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from pandas.util import testing as tm
44

55

6-
class Algorithms(object):
6+
class algorithm(object):
77
goal_time = 0.2
88

99
def setup(self):
@@ -24,28 +24,21 @@ def setup(self):
2424
self.arrneg = np.arange(-1000000, 0)
2525
self.arrmixed = np.array([1, -1]).repeat(500000)
2626

27-
# match
28-
self.uniques = tm.makeStringIndex(1000).values
29-
self.all = self.uniques.repeat(10)
30-
31-
def time_factorize_int(self):
27+
def time_int_factorize(self):
3228
self.int.factorize()
3329

34-
def time_factorize_float(self):
30+
def time_float_factorize(self):
3531
self.int.factorize()
3632

37-
def time_duplicated_int_unique(self):
33+
def time_int_unique_duplicated(self):
3834
self.int_unique.duplicated()
3935

40-
def time_duplicated_int(self):
36+
def time_int_duplicated(self):
4137
self.int.duplicated()
4238

43-
def time_duplicated_float(self):
39+
def time_float_duplicated(self):
4440
self.float.duplicated()
4541

46-
def time_match_strings(self):
47-
pd.match(self.all, self.uniques)
48-
4942
def time_add_overflow_pos_scalar(self):
5043
self.checked_add(self.arr, 1)
5144

@@ -65,7 +58,7 @@ def time_add_overflow_mixed_arr(self):
6558
self.checked_add(self.arr, self.arrmixed)
6659

6760

68-
class Hashing(object):
61+
class hashing(object):
6962
goal_time = 0.2
7063

7164
def setup(self):

asv_bench/benchmarks/attrs_caching.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,23 @@
11
from .pandas_vb_common import *
2-
from pandas.util.decorators import cache_readonly
32

43

5-
class DataFrameAttributes(object):
4+
class getattr_dataframe_index(object):
65
goal_time = 0.2
76

87
def setup(self):
98
self.df = DataFrame(np.random.randn(10, 6))
109
self.cur_index = self.df.index
1110

12-
def time_get_index(self):
11+
def time_getattr_dataframe_index(self):
1312
self.foo = self.df.index
1413

15-
def time_set_index(self):
16-
self.df.index = self.cur_index
17-
1814

19-
class CacheReadonly(object):
15+
class setattr_dataframe_index(object):
2016
goal_time = 0.2
2117

2218
def setup(self):
19+
self.df = DataFrame(np.random.randn(10, 6))
20+
self.cur_index = self.df.index
2321

24-
class Foo:
25-
26-
@cache_readonly
27-
def prop(self):
28-
return 5
29-
self.obj = Foo()
30-
31-
def time_cache_readonly(self):
32-
self.obj.prop
22+
def time_setattr_dataframe_index(self):
23+
self.df.index = self.cur_index

0 commit comments

Comments
 (0)