Merge remote-tracking branch 'upstream/master' into fix_deprecation_order

Merging the changes made in 24215, to rectify the _decorators.py behavior

Author: aqurilla

azure-pipelines.yml

@@ -1,28 +1,20 @@
 # Adapted from https://github.com/numba/numba/blob/master/azure-pipelines.yml
 jobs:
-# Mac and Linux could potentially use the same template
-# except it isn't clear how to use a different build matrix
-# for each, so for now they are separate
-- template: ci/azure/macos.yml
+# Mac and Linux use the same template
+- template: ci/azure/posix.yml
   parameters:
     name: macOS
     vmImage: xcode9-macos10.13
-- template: ci/azure/linux.yml
+- template: ci/azure/posix.yml
   parameters:
     name: Linux
     vmImage: ubuntu-16.04
 
-# Windows Python 2.7 needs VC 9.0 installed, and not sure
-# how to make that a conditional task, so for now these are
-# separate templates as well
+# Windows Python 2.7 needs VC 9.0 installed, handled in the template
 - template: ci/azure/windows.yml
   parameters:
     name: Windows
     vmImage: vs2017-win2016
-- template: ci/azure/windows-py27.yml
-  parameters:
-    name: WindowsPy27
-    vmImage: vs2017-win2016
 
 - job: 'Checks_and_doc'
   pool:

ci/azure/linux.yml

@@ -7,12 +7,30 @@ jobs:
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
-    maxParallel: 11
     matrix:
-      py35_np_120:
-        ENV_FILE: ci/deps/azure-macos-35.yaml
-        CONDA_PY: "35"
-        PATTERN: "not slow and not network"
+      ${{ if eq(parameters.name, 'macOS') }}:
+        py35_np_120:
+          ENV_FILE: ci/deps/azure-macos-35.yaml
+          CONDA_PY: "35"
+          PATTERN: "not slow and not network"
+
+      ${{ 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"
+
+        py37_locale:
+          ENV_FILE: ci/deps/azure-37-locale.yaml
+          CONDA_PY: "37"
+          PATTERN: "not slow and not network"
+          LOCALE_OVERRIDE: "zh_CN.UTF-8"
+
+        py36_locale_slow:
+          ENV_FILE: ci/deps/azure-36-locale_slow.yaml
+          CONDA_PY: "36"
+          PATTERN: "not slow and not network"
+          LOCALE_OVERRIDE: "it_IT.UTF-8"
 
   steps:
     - script: |
@@ -39,7 +57,7 @@ jobs:
     - task: PublishTestResults@2
       inputs:
         testResultsFiles: 'test-data-*.xml'
-        testRunTitle: 'MacOS-35'
+        testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
     - powershell: |
         $junitXml = "test-data-single.xml"
         $(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'

ci/azure/macos.yml renamed to ci/azure/posix.yml

@@ -7,18 +7,28 @@ jobs:
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
-    maxParallel: 11
     matrix:
       py36_np14:
         ENV_FILE: ci/deps/azure-windows-36.yaml
         CONDA_PY: "36"
 
+      py27_np121:
+        ENV_FILE: ci/deps/azure-windows-27.yaml
+        CONDA_PY: "27"
+
   steps:
     - task: CondaEnvironment@1
       inputs:
         updateConda: no
         packageSpecs: ''
 
+    - powershell: |
+        $wc = New-Object net.webclient
+        $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
+        Start-Process "VCForPython27.msi" /qn -Wait
+      displayName: 'Install VC 9.0 only for Python 2.7'
+      condition: eq(variables.CONDA_PY, '27')
+
     - script: |
         ci\\incremental\\setup_conda_environment.cmd
       displayName: 'Before Install'
@@ -33,7 +43,7 @@ jobs:
     - task: PublishTestResults@2
       inputs:
         testResultsFiles: 'test-data.xml'
-        testRunTitle: 'Windows 36'
+        testRunTitle: 'Windows-$(CONDA_PY)'
     - powershell: |
         $junitXml = "test-data.xml"
         $(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'

ci/azure/windows-py27.yml

@@ -1,24 +1,6 @@
 .. _10min:
 
-.. currentmodule:: pandas
-
-.. ipython:: python
-   :suppress:
-
-   import os
-   import numpy as np
-
-   import pandas as pd
-
-   np.random.seed(123456)
-   np.set_printoptions(precision=4, suppress=True)
-   pd.options.display.max_rows = 15
-
-   # portions of this were borrowed from the
-   # Pandas cheatsheet
-   # created during the PyData Workshop-Sprint 2012
-   # Hannah Chen, Henry Chow, Eric Cox, Robert Mauriello
-
+{{ header }}
 
 ********************
 10 Minutes to pandas
@@ -69,7 +51,7 @@ Creating a ``DataFrame`` by passing a dict of objects that can be converted to s
                        'F': 'foo'})
    df2
 
-The columns of the resulting ``DataFrame`` have different 
+The columns of the resulting ``DataFrame`` have different
 :ref:`dtypes <basics.dtypes>`.
 
 .. ipython:: python
@@ -83,7 +65,7 @@ will be completed:
 .. ipython::
 
    @verbatim
-   In [1]: df2.<TAB>
+   In [1]: df2.<TAB>  # noqa: E225, E999
    df2.A                  df2.bool
    df2.abs                df2.boxplot
    df2.add                df2.C
@@ -513,7 +495,7 @@ Another example that can be given is:
 Append
 ~~~~~~
 
-Append rows to a dataframe. See the :ref:`Appending <merging.concatenation>` 
+Append rows to a dataframe. See the :ref:`Appending <merging.concatenation>`
 section.
 
 .. ipython:: python
@@ -546,14 +528,14 @@ See the :ref:`Grouping section <groupby>`.
                       'D': np.random.randn(8)})
    df
 
-Grouping and then applying the :meth:`~DataFrame.sum` function to the resulting 
+Grouping and then applying the :meth:`~DataFrame.sum` function to the resulting
 groups.
 
 .. ipython:: python
 
    df.groupby('A').sum()
 
-Grouping by multiple columns forms a hierarchical index, and again we can 
+Grouping by multiple columns forms a hierarchical index, and again we can
 apply the ``sum`` function.
 
 .. ipython:: python
@@ -689,7 +671,7 @@ Convert the raw grades to a categorical data type.
     df["grade"] = df["raw_grade"].astype("category")
     df["grade"]
 
-Rename the categories to more meaningful names (assigning to 
+Rename the categories to more meaningful names (assigning to
 ``Series.cat.categories`` is inplace!).
 
 .. ipython:: python
@@ -738,7 +720,7 @@ See the :ref:`Plotting <visualization>` docs.
    @savefig series_plot_basic.png
    ts.plot()
 
-On a DataFrame, the :meth:`~DataFrame.plot` method is a convenience to plot all 
+On a DataFrame, the :meth:`~DataFrame.plot` method is a convenience to plot all
 of the columns with labels:
 
 .. ipython:: python
@@ -773,6 +755,7 @@ CSV
 .. ipython:: python
    :suppress:
 
+   import os
    os.remove('foo.csv')
 
 HDF5

ci/azure/windows.yml

@@ -1,15 +1,6 @@
 .. _advanced:
 
-.. currentmodule:: pandas
-
-.. ipython:: python
-   :suppress:
-
-   import numpy as np
-   import pandas as pd
-   np.random.seed(123456)
-   np.set_printoptions(precision=4, suppress=True)
-   pd.options.display.max_rows = 15
+{{ header }}
 
 ******************************
 MultiIndex / Advanced Indexing
@@ -572,7 +563,8 @@ they need to be sorted. As with any index, you can use :meth:`~DataFrame.sort_in
 
 .. ipython:: python
 
-   import random; random.shuffle(tuples)
+   import random
+   random.shuffle(tuples)
    s = pd.Series(np.random.randn(8), index=pd.MultiIndex.from_tuples(tuples))
    s
    s.sort_index()
@@ -702,7 +694,7 @@ Finally, as a small note on performance, because the ``take`` method handles
 a narrower range of inputs, it can offer performance that is a good deal
 faster than fancy indexing.
 
-.. ipython::
+.. ipython:: python
 
    arr = np.random.randn(10000, 5)
    indexer = np.arange(10000)