Merge from master

pandas-dev · jreback · Dec 30, 2018 · Dec 27, 2018 · Dec 29, 2018 · Dec 29, 2018
commit f137791d5ccda9f0ab688b424bae0afe50d584eb
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.travis.yml b/.travis.yml
@@ -34,32 +34,23 @@ matrix:
     include:
     - dist: trusty
       env:
-        - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network"
+        - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network and not db"
 
-    - dist: trusty
-      env:
-        - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" PATTERN="slow"
-      addons:
-        apt:
-          packages:
-          - language-pack-zh-hans
     - dist: trusty
       env:
         - JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow"
       addons:
         apt:
           packages:
           - python-gtk2
+
     - dist: trusty
       env:
-        - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
+        - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="not slow and not network" LOCALE_OVERRIDE="zh_CN.UTF-8"
+
     - dist: trusty
       env:
-        - 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"
-      addons:
-        apt:
-          packages:
-          - xsel
+        - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
 
     # In allow_failures
     - dist: trusty

diff --git a/README.md b/README.md
@@ -45,14 +45,6 @@
     </a>
   </td>
 </tr>
-<tr>
-  <td></td>
-  <td>
-    <a href="https://circleci.com/gh/pandas-dev/pandas">
-    <img src="https://circleci.com/gh/circleci/mongofinil/tree/master.svg?style=shi
E377
eld&circle-token=223d8cafa7b02902c3e150242520af8944e34671" alt="circleci build status" />
-    </a>
-  </td>
-</tr>
 <tr>
   <td></td>
   <td>

diff --git a/asv_bench/benchmarks/period.py b/asv_bench/benchmarks/period.py
@@ -1,5 +1,5 @@
-from pandas import (DataFrame, Series, Period, PeriodIndex, date_range,
-                    period_range)
+from pandas import (
+    DataFrame, Period, PeriodIndex, Series, date_range, period_range)
 
 
 class PeriodProperties(object):
@@ -94,7 +94,7 @@ def time_value_counts(self, typ):
 class Indexing(object):
 
     def setup(self):
-        self.index = PeriodIndex(start='1985', periods=1000, freq='D')
+        self.index = period_range(start='1985', periods=1000, freq='D')
         self.series = Series(range(1000), index=self.index)
         self.period = self.index[500]
 

diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml
@@ -12,29 +12,44 @@ jobs:
         py35_np_120:
           ENV_FILE: ci/deps/azure-macos-35.yaml
           CONDA_PY: "35"
-          PATTERN: "not slow and not network"
+          PATTERN: "not slow and not network and not db"
 
       ${{ if eq(parameters.name, 'Linux') }}:
         py27_np_120:
           ENV_FILE: ci/deps/azure-27-compat.yaml
           CONDA_PY: "27"
-          PATTERN: "not slow and not network"
+          PATTERN: "not slow and not network and not db"
 
-        py37_locale:
-          ENV_FILE: ci/deps/azure-37-locale.yaml
-          CONDA_PY: "37"
-          PATTERN: "not slow and not network"
+        py27_locale_slow_old_np:
+          ENV_FILE: ci/deps/azure-27-locale.yaml
+          CONDA_PY: "27"
+          PATTERN: "slow and not db"
           LOCALE_OVERRIDE: "zh_CN.UTF-8"
+          EXTRA_APT: "language-pack-zh-hans"
 
         py36_locale_slow:
           ENV_FILE: ci/deps/azure-36-locale_slow.yaml
           CONDA_PY: "36"
-          PATTERN: "not slow and not network"
+          PATTERN: "not slow and not network and not db"
           LOCALE_OVERRIDE:
F438
 "it_IT.UTF-8"
 
+        py37_locale:
+          ENV_FILE: ci/deps/azure-37-locale.yaml
+          CONDA_PY: "37"
+          PATTERN: "not slow and not network and not db"
+          LOCALE_OVERRIDE: "zh_CN.UTF-8"
+
+        py37_np_dev:
+          ENV_FILE: ci/deps/azure-37-numpydev.yaml
+          CONDA_PY: "37"
+          PATTERN: "not slow and not network and not db"
+          TEST_ARGS: "-W error"
+          PANDAS_TESTING_MODE: "deprecate"
+          EXTRA_APT: "xsel"
+
   steps:
     - script: |
-        if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386; fi
+        if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
         echo "Installing Miniconda"
         ci/incremental/install_miniconda.sh
         export PATH=$HOME/miniconda3/bin:$PATH

diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml
@@ -38,7 +38,7 @@ jobs:
       displayName: 'Build'
     - script: |
         call activate pandas-dev
-        pytest -m "not slow and not network" --junitxml=test-data.xml pandas -n 2 -r sxX --strict --durations=10 %*
+        pytest -m "not slow and not network and not db" --junitxml=test-data.xml pandas -n 2 -r sxX --strict --durations=10 %*
       displayName: 'Test'
     - task: PublishTestResults@2
       inputs:

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -45,7 +45,6 @@ if [ "$DOC" ]; then
         git add --all .
         git commit -m "Version" --allow-empty
 
-        git remote remove origin
         git remote add origin "https://${PANDAS_GH_TOKEN}@github.com/pandas-dev/pandas-docs-travis.git"
         git fetch origin
         git remote -v

diff --git a/ci/circle/install_circle.sh b/ci/circle/install_circle.sh
diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml
@@ -9,13 +9,11 @@ dependencies:
   - numexpr=2.6.1
   - numpy=1.12.0
   - openpyxl=2.5.5
-  - psycopg2
   - pytables=3.4.2
   - python-dateutil=2.5.0
   - python=2.7*
   - pytz=2013b
   - scipy=0.18.1
-  - sqlalchemy=0.7.8
   - xlrd=1.0.0
   - xlsxwriter=0.5.2
   - xlwt=0.7.5
@@ -25,5 +23,4 @@ dependencies:
   - pip:
     - html5lib==1.0b2
     - beautifulsoup4==4.2.1
-    - pymysql==0.6.0
     - hypothesis>=3.58.0
diff --git a/ci/deps/travis-27-locale.yaml → ci/deps/azure-27-locale.yaml b/ci/deps/travis-27-locale.yaml → ci/deps/azure-27-locale.yaml
diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml
@@ -15,15 +15,12 @@ dependencies:
   - numexpr
   - numpy
   - openpyxl
-  - psycopg2
-  - pymysql
   - pytables
   - python-dateutil
   - python=3.6*
   - pytz
   - s3fs
   - scipy
-  - sqlalchemy
   - xarray
   - xlrd
   - xlsxwriter

diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml
@@ -14,15 +14,12 @@ dependencies:
   - numexpr
   - numpy
   - openpyxl
-  - psycopg2
-  - pymysql
   - pytables
   - python-dateutil
   - python=3.7*
   - pytz
   - s3fs
   - scipy
-  - sqlalchemy
   - xarray
   - xlrd
   - xlsxwriter

diff --git a/ci/deps/travis-37-numpydev.yaml → ci/deps/azure-37-numpydev.yaml b/ci/deps/travis-37-numpydev.yaml → ci/deps/azure-37-numpydev.yaml
diff --git a/ci/deps/circle-36-locale.yaml → ci/deps/travis-36-locale.yaml b/ci/deps/circle-36-locale.yaml → ci/deps/travis-36-locale.yaml
diff --git a/doc/source/api/extensions.rst b/doc/source/api/extensions.rst
@@ -18,3 +18,4 @@ objects.
    api.extensions.register_index_accessor
    api.extensions.ExtensionDtype
    api.extensions.ExtensionArray
+   arrays.PandasArray
diff --git a/doc/source/api/series.rst b/doc/source/api/series.rst
@@ -444,6 +444,17 @@ strings and apply several methods to it. These can be accessed like
        Series.dt
        Index.str
 
+.. _api.arrays:
+
+Arrays
+------
+Pandas and third-party libraries can extend NumPy's type system (see :ref:`extending.extension-types`).
+
+.. autosummary::
+   :toctree: generated/
+
+   array
+
 .. _api.categorical:
 
 Categorical