Merge branch 'main' into gh52234-nan-not-in-index

Author: ssche

doc/source/getting_started/install.rst

@@ -216,7 +216,7 @@ pandas is equipped with an exhaustive set of unit tests, covering about 97% of
 the code base as of this writing. To run it on your machine to verify that
 everything is working (and that you have all of the dependencies, soft and hard,
 installed), make sure you have `pytest
-<https://docs.pytest.org/en/latest/>`__ >= 7.0 and `Hypothesis
+<https://docs.pytest.org/en/latest/>`__ >= 7.3.2 and `Hypothesis
 <https://hypothesis.readthedocs.io/en/latest/>`__ >= 6.34.2, then run:
 
 ::

doc/source/whatsnew/v2.1.0.rst

@@ -194,6 +194,8 @@ If installed, we now require:
 +-----------------+-----------------+----------+---------+
 | pytables        | 3.7.0           |          |    X    |
 +-----------------+-----------------+----------+---------+
+| pytest          | 7.3.2           |          |    X    |
++-----------------+-----------------+----------+---------+
 | python-snappy   | 0.6.1           |          |    X    |
 +-----------------+-----------------+----------+---------+
 | pyxlsb          | 1.0.9           |          |    X    |

pandas/core/frame.py

@@ -2981,6 +2981,7 @@ def to_orc(
         1     2     3
 
         If you want to get a buffer to the orc content you can write it to io.BytesIO
+
         >>> import io
         >>> b = io.BytesIO(df.to_orc())  # doctest: +SKIP
         >>> b.seek(0)  # doctest: +SKIP

pandas/tests/libs/test_hashtable.py

@@ -461,7 +461,7 @@ def test_get_labels_groupby_for_Int64(writable):
 
 def test_tracemalloc_works_for_StringHashTable():
     N = 1000
-    keys = np.arange(N).astype(np.compat.unicode).astype(np.object_)
+    keys = np.arange(N).astype(np.str_).astype(np.object_)
     with activated_tracemalloc():
         table = ht.StringHashTable()
         table.map_locations(keys)
@@ -484,7 +484,7 @@ def test_tracemalloc_for_empty_StringHashTable():
 
 @pytest.mark.parametrize("N", range(1, 110))
 def test_no_reallocation_StringHashTable(N):
-    keys = np.arange(N).astype(np.compat.unicode).astype(np.object_)
+    keys = np.arange(N).astype(np.str_).astype(np.object_)
     preallocated_table = ht.StringHashTable(N)
     n_buckets_start = preallocated_table.get_state()["n_buckets"]
     preallocated_table.map_locations(keys)

pandas/tests/plotting/conftest.py

@@ -7,6 +7,13 @@
 )
 
 
+@pytest.fixture(autouse=True)
+def non_interactive():
+    mpl = pytest.importorskip("matplotlib")
+    mpl.use("template")
+    yield
+
+
 @pytest.fixture(autouse=True)
 def reset_rcParams():
     mpl = pytest.importorskip("matplotlib")
@@ -16,8 +23,11 @@ def reset_rcParams():
 
 @pytest.fixture(autouse=True)
 def close_all_figures():
+    # https://stackoverflow.com/q/31156578
     yield
     plt = pytest.importorskip("matplotlib.pyplot")
+    plt.cla()
+    plt.clf()
     plt.close("all")