Skip to content

Commit 988c4ff

Browse files
committed
fix merge conflicts
2 parents 9ab9040 + c0e13d1 commit 988c4ff

File tree

260 files changed

+5325
-20181
lines changed

Some content is hidden

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

260 files changed

+5325
-20181
lines changed

.github/CONTRIBUTING.md

Lines changed: 13 additions & 13 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/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.
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.
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/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.
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.
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/pydata/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/pandas-dev/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/pydata/pandas.git
70+
git remote add upstream git://github.com/pandas-dev/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/pydata/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/pandas-dev/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

@@ -278,11 +278,11 @@ Please try to maintain backward compatibility. *pandas* has lots of users with l
278278

279279
Adding tests is one of the most common requests after code is pushed to *pandas*. Therefore, it is worth getting in the habit of writing tests ahead of time so this is never an issue.
280280

281-
Like many packages, *pandas* uses the [Nose testing system](http://nose.readthedocs.org/en/latest/index.html) and the convenient extensions in [numpy.testing](http://docs.scipy.org/doc/numpy/reference/routines.testing.html).
281+
Like many packages, *pandas* uses the [Nose testing system](https://nose.readthedocs.io/en/latest/index.html) and the convenient extensions in [numpy.testing](http://docs.scipy.org/doc/numpy/reference/routines.testing.html).
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/pydata/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/pandas-dev/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

@@ -323,7 +323,7 @@ Performance matters and it is worth considering whether your code has introduced
323323
>
324324
> The asv benchmark suite was translated from the previous framework, vbench, so many stylistic issues are likely a result of automated transformation of the code.
325325
326-
To use asv you will need either `conda` or `virtualenv`. For more details please check the [asv installation webpage](http://asv.readthedocs.org/en/latest/installing.html).
326+
To use asv you will need either `conda` or `virtualenv`. For more details please check the [asv installation webpage](https://asv.readthedocs.io/en/latest/installing.html).
327327

328328
To install asv:
329329

@@ -360,7 +360,7 @@ This command is equivalent to:
360360

361361
This will launch every test only once, display stderr from the benchmarks, and use your local `python` that comes from your `$PATH`.
362362

363-
Information on how to write a benchmark can be found in the [asv documentation](http://asv.readthedocs.org/en/latest/writing_benchmarks.html).
363+
Information on how to write a benchmark can be found in the [asv documentation](https://asv.readthedocs.io/en/latest/writing_benchmarks.html).
364364

365365
#### Running the vbench performance test suite (phasing out)
366366

@@ -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/pydata/pandas/wiki/Performance-Testing) for information on how to write a benchmark.
381+
See the [performance testing wiki](https://github.com/pandas-dev/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/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)).
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)).
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/pydata/pandas.git (fetch)
470-
upstream git://github.com/pydata/pandas.git (push)
469+
upstream git://github.com/pandas-dev/pandas.git (fetch)
470+
upstream git://github.com/pandas-dev/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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
#### A small, complete example of the issue
1+
#### Code Sample, a copy-pastable example if possible
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.]
710

811
#### Expected Output
912

1013
#### Output of ``pd.show_versions()``
1114

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

1518
</details>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*.class
2828
*.dll
2929
*.exe
30+
*.pxi
3031
*.o
3132
*.py[ocd]
3233
*.so

.travis.yml

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ cache:
1414

1515
env:
1616
global:
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
17+
18+
# pandas-docs-travis GH
2319
- secure: "PCzUFR8CHmw9lH84p4ygnojdF7Z8U5h7YfY0RyT+5K/aiQ1ZTU3ZkDTPI0/rR5FVMxsEEKEQKMcc5fvqW0PeD7Q2wRmluloKgT9w4EVEJ1ppKf7lITPcvZR2QgVOvjv4AfDtibLHFNiaSjzoqyJVjM4igjOu8WTlF3JfZcmOQjQ="
2420

2521
git:
@@ -34,6 +30,7 @@ matrix:
3430
compiler: clang
3531
osx_image: xcode6.4
3632
env:
33+
- PYTHON_VERSION=3.5
3734
- JOB_NAME: "35_osx"
3835
- NOSE_ARGS="not slow and not network and not disabled"
3936
- BUILD_TYPE=conda
@@ -43,6 +40,7 @@ matrix:
4340
- USE_CACHE=true
4441
- python: 2.7
4542
env:
43+
- PYTHON_VERSION=2.7
4644
- JOB_NAME: "27_slow_nnet_LOCALE"
4745
- NOSE_ARGS="slow and not network and not disabled"
4846
- LOCALE_OVERRIDE="zh_CN.UTF-8"
@@ -56,6 +54,7 @@ matrix:
5654
- language-pack-zh-hans
5755
- python: 2.7
5856
env:
57+
- PYTHON_VERSION=2.7
5958
- JOB_NAME: "27_nslow"
6059
- NOSE_ARGS="not slow and not disabled"
6160
- FULL_DEPS=true
@@ -69,6 +68,7 @@ matrix:
6968
- python-gtk2
7069
- python: 3.4
7170
env:
71+
- PYTHON_VERSION=3.4
7272
- JOB_NAME: "34_nslow"
7373
- NOSE_ARGS="not slow and not disabled"
7474
- FULL_DEPS=true
@@ -81,6 +81,7 @@ matrix:
8181
- xsel
8282
- python: 3.5
8383
env:
84+
- PYTHON_VERSION=3.5
8485
- JOB_NAME: "35_nslow"
8586
- NOSE_ARGS="not slow and not network and not disabled"
8687
- FULL_DEPS=true
@@ -95,6 +96,7 @@ matrix:
9596
# In allow_failures
9697
- python: 2.7
9798
env:
99+
- PYTHON_VERSION=2.7
98100
- JOB_NAME: "27_slow"
99101
- JOB_TAG=_SLOW
100102
- NOSE_ARGS="slow and not network and not disabled"
@@ -104,6 +106,7 @@ matrix:
104106
# In allow_failures
105107
- python: 3.4
106108
env:
109+
- PYTHON_VERSION=3.4
107110
- JOB_NAME: "34_slow"
108111
- JOB_TAG=_SLOW
109112
- NOSE_ARGS="slow and not network and not disabled"
@@ -118,16 +121,31 @@ matrix:
118121
# In allow_failures
119122
- python: 2.7
120123
env:
124+
- PYTHON_VERSION=2.7
121125
- JOB_NAME: "27_build_test_conda"
122126
- JOB_TAG=_BUILD_TEST
123127
- NOSE_ARGS="not slow and not disabled"
124128
- FULL_DEPS=true
125129
- BUILD_TEST=true
126130
- CACHE_NAME="27_build_test_conda"
127131
- USE_CACHE=true
132+
# In allow_failures
133+
- python: 3.6-dev
134+
env:
135+
- PYTHON_VERSION=3.6
136+
- JOB_NAME: "36_dev"
137+
- JOB_TAG=_DEV
138+
- NOSE_ARGS="not slow and not network and not disabled"
139+
- PANDAS_TESTING_MODE="deprecate"
140+
addons:
141+
apt:
142+
packages:
143+
- libatlas-base-dev
144+
- gfortran
128145
# In allow_failures
129146
- python: 3.5
130147
env:
148+
- PYTHON_VERSION=3.5
131149
- JOB_NAME: "35_numpy_dev"
132150
- JOB_TAG=_NUMPY_DEV
133151
- NOSE_ARGS="not slow and not network and not disabled"
@@ -142,6 +160,7 @@ matrix:
142160
# In allow_failures
143161
- python: 2.7
144162
env:
163+
- PYTHON_VERSION=2.7
145164
- JOB_NAME: "27_nslow_nnet_COMPAT"
146165
- NOSE_ARGS="not slow and not network and not disabled"
147166
- LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -156,6 +175,7 @@ matrix:
156175
# In allow_failures
157176
- python: 3.5
158177
env:
178+
- PYTHON_VERSION=3.5
159179
- JOB_NAME: "35_ascii"
160180
- JOB_TAG=_ASCII
161181
- NOSE_ARGS="not slow and not network and not disabled"
@@ -165,6 +185,7 @@ matrix:
165185
# In allow_failures
166186
- python: 2.7
167187
env:
188+
- PYTHON_VERSION=2.7
168189
- JOB_NAME: "doc_build"
169190
- FULL_DEPS=true
170191
- DOC_BUILD=true
@@ -174,6 +195,7 @@ matrix:
174195
allow_failures:
175196
- python: 2.7
176197
env:
198+
- PYTHON_VERSION=2.7
177199
- JOB_NAME: "27_slow"
178200
- JOB_TAG=_SLOW
179201
- NOSE_ARGS="slow and not network and not disabled"
@@ -182,6 +204,7 @@ matrix:
182204
- USE_CACHE=true
183205
- python: 3.4
184206
env:
207+
- PYTHON_VERSION=3.4
185208
- JOB_NAME: "34_slow"
186209
- JOB_TAG=_SLOW
187210
- NOSE_ARGS="slow and not network and not disabled"
@@ -195,28 +218,43 @@ matrix:
195218
- xsel
196219
- python: 2.7
197220
env:
221+
- PYTHON_VERSION=2.7
198222
- JOB_NAME: "27_build_test_conda"
199223
- JOB_TAG=_BUILD_TEST
200224
- NOSE_ARGS="not slow and not disabled"
201225
- FULL_DEPS=true
202226
- BUILD_TEST=true
203227
- CACHE_NAME="27_build_test_conda"
204228
- USE_CACHE=true
205-
- python: 3.5
229+
- python: 3.6-dev
206230
env:
207-
- JOB_NAME: "35_numpy_dev"
208-
- JOB_TAG=_NUMPY_DEV
231+
- PYTHON_VERSION=3.6
232+
- JOB_NAME: "36_dev"
233+
- JOB_TAG=_DEV
209234
- NOSE_ARGS="not slow and not network and not disabled"
210235
- PANDAS_TESTING_MODE="deprecate"
211-
- CACHE_NAME="35_numpy_dev"
212-
- USE_CACHE=true
236+
addons:
237+
apt:
238+
packages:
239+
- libatlas-base-dev
240+
- gfortran
241+
- python: 3.5
242+
env:
243+
- PYTHON_VERSION=3.5
244+
- JOB_NAME: "35_numpy_dev"
245+
- JOB_TAG=_NUMPY_DEV
246+
- NOSE_ARGS="not slow and not network and not disabled"
247+
- PANDAS_TESTING_MODE="deprecate"
248+
- CACHE_NAME="35_numpy_dev"
249+
- USE_CACHE=true
213250
addons:
214251
apt:
215252
packages:
216253
- libatlas-base-dev
217254
- gfortran
218255
- python: 2.7
219256
env:
257+
- PYTHON_VERSION=2.7
220258
- JOB_NAME: "27_nslow_nnet_COMPAT"
221259
- NOSE_ARGS="not slow and not network and not disabled"
222260
- LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -230,6 +268,7 @@ matrix:
230268
- language-pack-it
231269
- python: 3.5
232270
env:
271+
- PYTHON_VERSION=3.5
233272
- JOB_NAME: "35_ascii"
234273
- JOB_TAG=_ASCII
235274
- NOSE_ARGS="not slow and not network and not disabled"
@@ -238,6 +277,7 @@ matrix:
238277
- USE_CACHE=true
239278
- python: 2.7
240279
env:
280+
- PYTHON_VERSION=2.7
241281
- JOB_NAME: "doc_build"
242282
- FULL_DEPS=true
243283
- DOC_BUILD=true
@@ -249,7 +289,7 @@ before_install:
249289
- echo "before_install"
250290
- source ci/travis_process_gbq_encryption.sh
251291
- echo $VIRTUAL_ENV
252-
- export PATH="$HOME/miniconda/bin:$PATH"
292+
- export PATH="$HOME/miniconda3/bin:$PATH"
253293
- df -h
254294
- date
255295
- pwd

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/pydata/pandas/blob/master/doc/logo/pandas_logo.png"><br>
2+
<img src="https://github.com/pandas-dev/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/pydata/pandas">
29-
<img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="travis build status" />
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" />
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/pydata/pandas/coverage.svg?branch=master" alt="coverage" /></td>
42+
<td><img src="https://codecov.io/github/pandas-dev/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/pydata/pandas
130+
http://github.com/pandas-dev/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/pydata/pandas.
6+
details, see the commit logs at http://github.com/pandas-dev/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/pydata/pandas/commit/",
24+
"show_commit_url": "https://github.com/pandas-dev/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`.

0 commit comments

Comments
 (0)