fix merge conflicts

Author: rforgione

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ Where to start?
 
 All contributions, bug reports, bug fixes, documentation improvements, enhancements and ideas are welcome.
 
-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.
+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.
 
 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!
 
@@ -49,7 +49,7 @@ Now that you have an issue you want to fix, enhancement to add, or documentation
 
 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.
 
-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.
+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.
 
 Some great resources for learning Git:
 
@@ -63,11 +63,11 @@ Some great resources for learning Git:
 
 ### Forking
 
-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:
+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:
 
     git clone git@github.com:your-user-name/pandas.git pandas-yourname
     cd pandas-yourname
-    git remote add upstream git://github.com/pydata/pandas.git
+    git remote add upstream git://github.com/pandas-dev/pandas.git
 
 This creates the directory pandas-yourname and connects your repository to the upstream (main project) *pandas* repository.
 
@@ -268,7 +268,7 @@ and make these changes with:
 
     pep8radius master --diff --in-place
 
-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).
+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).
 
 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.
 
@@ -278,11 +278,11 @@ Please try to maintain backward compatibility. *pandas* has lots of users with l
 
 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.
 
-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).
+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).
 
 #### Writing tests
 
-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.
+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.
 
 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:
 
@@ -323,7 +323,7 @@ Performance matters and it is worth considering whether your code has introduced
 >
 > 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.
 
-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).
+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).
 
 To install asv:
 
@@ -360,7 +360,7 @@ This command is equivalent to:
 
 This will launch every test only once, display stderr from the benchmarks, and use your local `python` that comes from your `$PATH`.
 
-Information on how to write a benchmark can be found in the [asv documentation](http://asv.readthedocs.org/en/latest/writing_benchmarks.html).
+Information on how to write a benchmark can be found in the [asv documentation](https://asv.readthedocs.io/en/latest/writing_benchmarks.html).
 
 #### Running the vbench performance test suite (phasing out)
 
@@ -378,7 +378,7 @@ This will check out the master revision and run the suite on both master and you
 
 You can run specific benchmarks using the `-r` flag, which takes a regular expression.
 
-See the [performance testing wiki](https://github.com/pydata/pandas/wiki/Performance-Testing) for information on how to write a benchmark.
+See the [performance testing wiki](https://github.com/pandas-dev/pandas/wiki/Performance-Testing) for information on how to write a benchmark.
 
 ### Documenting your code
 
@@ -390,7 +390,7 @@ If your code is an enhancement, it is most likely necessary to add usage example
 .. versionadded:: 0.17.0
 ```
 
-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)).
+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)).
 
 Contributing your changes to *pandas*
 -------------------------------------
@@ -466,8 +466,8 @@ If you added the upstream repository as described above you will see something l
 
     origin  git@github.com:yourname/pandas.git (fetch)
     origin  git@github.com:yourname/pandas.git (push)
-    upstream        git://github.com/pydata/pandas.git (fetch)
-    upstream        git://github.com/pydata/pandas.git (push)
+    upstream        git://github.com/pandas-dev/pandas.git (fetch)
+    upstream        git://github.com/pandas-dev/pandas.git (push)
 
 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.
 

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,18 @@
-#### A small, complete example of the issue
+#### Code Sample, a copy-pastable example if possible
 
 ```python
 # Your code here
 
 ```
+#### Problem description
+
+[this should explain **why** the current behaviour is a problem and why the expected output is a better solution.]
 
 #### Expected Output
 
 #### Output of ``pd.show_versions()``
 
 <details>
-# Paste the output here
+# Paste the output here pd.show_versions() here
 
 </details>

.gitignore

@@ -27,6 +27,7 @@
 *.class
 *.dll
 *.exe
+*.pxi
 *.o
 *.py[ocd]
 *.so

.travis.yml

@@ -14,12 +14,8 @@ cache:
 
 env:
   global:
-  # scatterci API key
-  #- secure: "Bx5umgo6WjuGY+5XFa004xjCiX/vq0CyMZ/ETzcs7EIBI1BE/0fIDXOoWhoxbY9HPfdPGlDnDgB9nGqr5wArO2s+BavyKBWg6osZ3dmkfuJPMOWeyCa92EeP+sfKw8e5HSU5MizW9e319wHWOF/xkzdHR7T67Qd5erhv91x4DnQ="
-  # ironcache API key
-  #- secure: "e4eEFn9nDQc3Xa5BWYkzfX37jaWVq89XidVX+rcCNEr5OlOImvveeXnF1IzbRXznH4Sv0YsLwUd8RGUWOmyCvkONq/VJeqCHWtTMyfaCIdqSyhIP9Odz8r9ahch+Y0XFepBey92AJHmlnTh+2GjCDgIiqq4fzglojnp56Vg1ojA="
-  #- secure: "CjmYmY5qEu3KrvMtel6zWFEtMq8ORBeS1S1odJHnjQpbwT1KY2YFZRVlLphfyDQXSz6svKUdeRrCNp65baBzs3DQNA8lIuXGIBYFeJxqVGtYAZZs6+TzBPfJJK798sGOj5RshrOJkFG2rdlWNuTq/XphI0JOrN3nPUkRrdQRpAw="
-  # pandas-docs-bot GH
+
+  # pandas-docs-travis GH
   - secure: "PCzUFR8CHmw9lH84p4ygnojdF7Z8U5h7YfY0RyT+5K/aiQ1ZTU3ZkDTPI0/rR5FVMxsEEKEQKMcc5fvqW0PeD7Q2wRmluloKgT9w4EVEJ1ppKf7lITPcvZR2QgVOvjv4AfDtibLHFNiaSjzoqyJVjM4igjOu8WTlF3JfZcmOQjQ="
 
 git:
@@ -34,6 +30,7 @@ matrix:
       compiler: clang
       osx_image: xcode6.4
       env:
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "35_osx"
         - NOSE_ARGS="not slow and not network and not disabled"
         - BUILD_TYPE=conda
@@ -43,6 +40,7 @@ matrix:
         - USE_CACHE=true
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow_nnet_LOCALE"
         - NOSE_ARGS="slow and not network and not disabled"
         - LOCALE_OVERRIDE="zh_CN.UTF-8"
@@ -56,6 +54,7 @@ matrix:
           - language-pack-zh-hans
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow"
         - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
@@ -69,6 +68,7 @@ matrix:
           - python-gtk2
     - python: 3.4
       env:
+        - PYTHON_VERSION=3.4
         - JOB_NAME: "34_nslow"
         - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
@@ -81,6 +81,7 @@ matrix:
           - xsel
     - python: 3.5
       env:
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "35_nslow"
         - NOSE_ARGS="not slow and not network and not disabled"
         - FULL_DEPS=true
@@ -95,6 +96,7 @@ matrix:
 #    In allow_failures
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
@@ -104,6 +106,7 @@ matrix:
 #    In allow_failures
     - python: 3.4
       env:
+        - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
@@ -118,16 +121,31 @@ matrix:
 #    In allow_failures
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
         - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
+#    In allow_failures
+    - python: 3.6-dev
+      env:
+        - PYTHON_VERSION=3.6
+        - JOB_NAME: "36_dev"
+        - JOB_TAG=_DEV
+        - NOSE_ARGS="not slow and not network and not disabled"
+        - PANDAS_TESTING_MODE="deprecate"
+      addons:
+        apt:
+          packages:
+          - libatlas-base-dev
+          - gfortran
 #    In allow_failures
     - python: 3.5
       env:
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "35_numpy_dev"
         - JOB_TAG=_NUMPY_DEV
         - NOSE_ARGS="not slow and not network and not disabled"
@@ -142,6 +160,7 @@ matrix:
 #    In allow_failures
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
         - NOSE_ARGS="not slow and not network and not disabled"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -156,6 +175,7 @@ matrix:
 #    In allow_failures
     - python: 3.5
       env:
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
         - NOSE_ARGS="not slow and not network and not disabled"
@@ -165,6 +185,7 @@ matrix:
 #    In allow_failures
     - python: 2.7
       env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true
@@ -174,6 +195,7 @@ matrix:
     allow_failures:
       - python: 2.7
         env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
@@ -182,6 +204,7 @@ matrix:
         - USE_CACHE=true
       - python: 3.4
         env:
+        - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
@@ -195,28 +218,43 @@ matrix:
             - xsel
       - python: 2.7
         env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
         - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
-      - python: 3.5
+      - python: 3.6-dev
         env:
-        - JOB_NAME: "35_numpy_dev"
-        - JOB_TAG=_NUMPY_DEV
+        - PYTHON_VERSION=3.6
+        - JOB_NAME: "36_dev"
+        - JOB_TAG=_DEV
         - NOSE_ARGS="not slow and not network and not disabled"
         - PANDAS_TESTING_MODE="deprecate"
-        - CACHE_NAME="35_numpy_dev"
-        - USE_CACHE=true
+        addons:
+          apt:
+            packages:
+            - libatlas-base-dev
+            - gfortran
+      - python: 3.5
+        env:
+          - PYTHON_VERSION=3.5
+          - JOB_NAME: "35_numpy_dev"
+          - JOB_TAG=_NUMPY_DEV
+          - NOSE_ARGS="not slow and not network and not disabled"
+          - PANDAS_TESTING_MODE="deprecate"
+          - CACHE_NAME="35_numpy_dev"
+          - USE_CACHE=true
         addons:
           apt:
             packages:
             - libatlas-base-dev
             - gfortran
       - python: 2.7
         env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
         - NOSE_ARGS="not slow and not network and not disabled"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
@@ -230,6 +268,7 @@ matrix:
             - language-pack-it
       - python: 3.5
         env:
+        - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
         - NOSE_ARGS="not slow and not network and not disabled"
@@ -238,6 +277,7 @@ matrix:
         - USE_CACHE=true
       - python: 2.7
         env:
+        - PYTHON_VERSION=2.7
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true
@@ -249,7 +289,7 @@ before_install:
   - echo "before_install"
   - source ci/travis_process_gbq_encryption.sh
   - echo $VIRTUAL_ENV
-  - export PATH="$HOME/miniconda/bin:$PATH"
+  - export PATH="$HOME/miniconda3/bin:$PATH"
   - df -h
   - date
   - pwd

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://github.com/pydata/pandas/blob/master/doc/logo/pandas_logo.png"><br>
+  <img src="https://github.com/pandas-dev/pandas/blob/master/doc/logo/pandas_logo.png"><br>
 </div>
 
 -----------------
@@ -25,8 +25,8 @@
 <tr>
   <td>Build Status</td>
   <td>
-    <a href="https://travis-ci.org/pydata/pandas">
-    <img src="https://travis-ci.org/pydata/pandas.svg?branch=master" alt="travis build status" />
+    <a href="https://travis-ci.org/pandas-dev/pandas">
+    <img src="https://travis-ci.org/pandas-dev/pandas.svg?branch=master" alt="travis build status" />
     </a>
   </td>
 </tr>
@@ -39,7 +39,7 @@
 </tr>
 <tr>
   <td>Coverage</td>
-  <td><img src="https://codecov.io/github/pydata/pandas/coverage.svg?branch=master" alt="coverage" /></td>
+  <td><img src="https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master" alt="coverage" /></td>
 </tr>
 <tr>
   <td>Conda</td>
@@ -127,7 +127,7 @@ Here are just a few of the things that pandas does well:
 
 ## Where to get it
 The source code is currently hosted on GitHub at:
-http://github.com/pydata/pandas
+http://github.com/pandas-dev/pandas
 
 Binary installers for the latest released version are available at the [Python
 package index](http://pypi.python.org/pypi/pandas/) and on conda.

RELEASE.md

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

asv_bench/asv.conf.json

@@ -21,7 +21,7 @@
     "environment_type": "conda",
 
     // the base URL to show a commit for the project.
-    "show_commit_url": "https://github.com/pydata/pandas/commit/",
+    "show_commit_url": "https://github.com/pandas-dev/pandas/commit/",
 
     // The Pythons you'd like to test against.  If not provided, defaults
     // to the current version of Python used to run `asv`.