Merge branch 'master' into frozen-index

Author: bthayer2365

ci/requirements-2.7.pip

@@ -1,8 +1,5 @@
 blosc
-httplib2
-google-api-python-client==1.2
-python-gflags==2.0
-oauth2client==1.5.0
+pandas-gbq
 pathlib
 backports.lzma
 py

ci/requirements-3.4.pip

@@ -1,5 +1,2 @@
 python-dateutil==2.2
 blosc
-httplib2
-google-api-python-client
-oauth2client

ci/requirements-3.4_SLOW.pip

@@ -1 +1,2 @@
 xarray==0.9.1
+pandas-gbq

ci/requirements-3.5.pip

@@ -202,8 +202,8 @@ def html():
         raise SystemExit("Building HTML failed.")
     try:
         # remove stale file
-        os.system('rm source/html-styling.html')
-        os.system('cd build; rm -f html/pandas.zip;')
+        os.remove('source/html-styling.html')
+        os.remove('build/html/pandas.zip')
     except:
         pass
 

doc/make.py

@@ -965,6 +965,7 @@ The different indexing operation can potentially change the dtype of a ``Series`
    res
 
 .. ipython:: python
+
    series2 = pd.Series([True])
    series2.dtype
    res = series2.reindex_like(series1)

doc/source/advanced.rst

@@ -1889,7 +1889,7 @@ gotchas
 
 Performing selection operations on ``integer`` type data can easily upcast the data to ``floating``.
 The dtype of the input data will be preserved in cases where ``nans`` are not introduced (starting in 0.11.0)
-See also :ref:`Support for integer ``NA`` <gotchas.intna>`
+See also :ref:`Support for integer NA <gotchas.intna>`
 
 .. ipython:: python
 

doc/source/basics.rst

@@ -461,7 +461,7 @@ C (cpplint)
 
 *pandas* uses the `Google <https://google.github.io/styleguide/cppguide.html>`_
 standard. Google provides an open source style checker called ``cpplint``, but we
-use a fork of it that can be found `here <https://github.com/cpplint/cpplint>`_.
+use a fork of it that can be found `here <https://github.com/cpplint/cpplint>`__.
 Here are *some* of the more common ``cpplint`` issues:
 
   - we restrict line-length to 80 characters to promote readability
@@ -479,7 +479,7 @@ You can also run this command on an entire directory if necessary::
 
 To make your commits compliant with this standard, you can install the
 `ClangFormat <http://clang.llvm.org/docs/ClangFormat.html>`_ tool, which can be
-downloaded `here <http://llvm.org/builds/>`_. To configure, in your home directory,
+downloaded `here <http://llvm.org/builds/>`__. To configure, in your home directory,
 run the following command::
 
     clang-format style=google -dump-config  > .clang-format
@@ -520,15 +520,6 @@ submitting code to run the check yourself on the diff::
 
    git diff master | flake8 --diff
 
-Furthermore, we've written a tool to check that your commits are PEP8 great, `pip install pep8radius
-<https://github.com/hayd/pep8radius>`_. Look at PEP8 fixes in your branch vs master with::
-
-    pep8radius master --diff
-
-and make these changes with::
-
-    pep8radius master --diff --in-place
-
 Backwards Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -611,7 +602,27 @@ Or with one of the following constructs::
     pytest pandas/tests/[test-module].py::[TestClass]
     pytest pandas/tests/[test-module].py::[TestClass]::[test_method]
 
-For more, see the `pytest<http://doc.pytest.org/en/latest/>`_ documentation.
+Using `pytest-xdist <https://pypi.python.org/pypi/pytest-xdist>`_, one can 
+speed up local testing on multicore machines. To use this feature, you will
+need to install `pytest-xdist` via::
+
+    pip install pytest-xdist
+    
+Two scripts are provided to assist with this.  These scripts distribute 
+testing across 4 threads.
+
+On Unix variants, one can type::
+
+    test_fast.sh
+    
+On Windows, one can type::
+
+    test_fast.bat
+    
+This can significantly reduce the time it takes to locally run tests before
+submitting a pull request.
+
+For more, see the `pytest <http://doc.pytest.org/en/latest/>`_ documentation.
 
     .. versionadded:: 0.20.0
 

doc/source/contributing.rst

@@ -282,7 +282,7 @@ Optional Dependencies
     okay.)
   * `BeautifulSoup4`_ and `lxml`_
   * `BeautifulSoup4`_ and `html5lib`_ and `lxml`_
-  * Only `lxml`_, although see :ref:`HTML Table Parsing <gotchas.html>`
+  * Only `lxml`_, although see :ref:`HTML Table Parsing <io.html.gotchas>`
     for reasons as to why you should probably **not** take this approach.
 
   .. warning::