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

Resolve conflict in pandas/tests/plotting/test_frame.py

Author: nrebena

.pre-commit-config.yaml

@@ -16,3 +16,15 @@ repos:
     -   id: isort
         language: python_venv
         exclude: ^pandas/__init__\.py$|^pandas/core/api\.py$
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.730
+    hooks:
+     -  id: mypy
+        # We run mypy over all files because of:
+        #  * changes in type definitions may affect non-touched files.
+        #  * Running it with `mypy pandas` and the filenames will lead to
+        #    spurious duplicate module errors,
+        #    see also https://github.com/pre-commit/mirrors-mypy/issues/5
+        pass_filenames: false
+        args:
+        - pandas

RELEASE.md

@@ -2,5 +2,5 @@ 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
+[here](https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html). For full
 details, see the commit logs at http://github.com/pandas-dev/pandas.

asv_bench/asv.conf.json

@@ -7,7 +7,7 @@
     "project": "pandas",
 
     // The project's homepage
-    "project_url": "http://pandas.pydata.org/",
+    "project_url": "https://pandas.pydata.org/",
 
     // The URL of the source code repository for the project being
     // benchmarked

asv_bench/benchmarks/algorithms.py

@@ -5,7 +5,8 @@
 from pandas._libs import lib
 
 import pandas as pd
-from pandas.util import testing as tm
+
+from .pandas_vb_common import tm
 
 for imp in ["pandas.util", "pandas.tools.hashing"]:
     try:

asv_bench/benchmarks/categoricals.py

@@ -3,7 +3,8 @@
 import numpy as np
 
 import pandas as pd
-import pandas._testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas.api.types import union_categoricals

asv_bench/benchmarks/ctors.py

@@ -1,7 +1,8 @@
 import numpy as np
 
 from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp
-import pandas._testing as tm
+
+from .pandas_vb_common import tm
 
 
 def no_change(arr):

asv_bench/benchmarks/frame_ctor.py

@@ -1,7 +1,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range
-import pandas._testing as tm
+
+from .pandas_vb_common import tm
 
 try:
     from pandas.tseries.offsets import Nano, Hour

asv_bench/benchmarks/frame_methods.py

@@ -4,7 +4,8 @@
 import numpy as np
 
 from pandas import DataFrame, MultiIndex, NaT, Series, date_range, isnull, period_range
-import pandas._testing as tm
+
+from .pandas_vb_common import tm
 
 
 class GetNumericData:

asv_bench/benchmarks/gil.py

@@ -1,9 +1,10 @@
 import numpy as np
 
 from pandas import DataFrame, Series, date_range, factorize, read_csv
-import pandas._testing as tm
 from pandas.core.algorithms import take_1d
 
+from .pandas_vb_common import tm
+
 try:
     from pandas import (
         rolling_median,

asv_bench/benchmarks/groupby.py

@@ -13,7 +13,8 @@
     date_range,
     period_range,
 )
-import pandas._testing as tm
+
+from .pandas_vb_common import tm
 
 method_blacklist = {
     "object": {