Merge pull request #224 from pandas-dev/master

Sync Fork from Upstream Repo

Author: sthagen

.github/workflows/ci.yml

@@ -133,15 +133,15 @@ jobs:
         echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa
         echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
-      if: ${{github.event_name == 'push' && github.ref == 'refs/head/master'}}
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Upload web
       run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' --exclude='Pandas_Cheat_Sheet*' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
-      if: ${{github.event_name == 'push' && github.ref == 'refs/head/master'}}
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Upload dev docs
       run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
-      if: ${{github.event_name == 'push' && github.ref == 'refs/head/master'}}
+      if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
 
     - name: Move docs into site directory
       run: mv doc/build/html web/build/docs

doc/source/ecosystem.rst

@@ -445,6 +445,12 @@ provides a familiar ``DataFrame`` interface for out-of-core, parallel and distri
 
 Dask-ML enables parallel and distributed machine learning using Dask alongside existing machine learning libraries like Scikit-Learn, XGBoost, and TensorFlow.
 
+`Ibis <https://ibis-project.org/docs/>`__
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ibis offers a standard way to write analytics code, that can be run in multiple engines. It helps in bridging the gap between local Python environments (like pandas) and remote storage and execution systems like Hadoop components (like HDFS, Impala, Hive, Spark) and SQL databases (Postgres, etc.).
+
+
 `Koalas <https://koalas.readthedocs.io/en/latest/>`__
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

pandas/tests/scalar/timedelta/test_arithmetic.py

@@ -10,15 +10,13 @@
 import numpy as np
 import pytest
 
-from pandas.compat import is_numpy_dev
 from pandas.errors import OutOfBoundsTimedelta
 
 import pandas as pd
 from pandas import (
     NaT,
     Timedelta,
     Timestamp,
-    compat,
     offsets,
 )
 import pandas._testing as tm
@@ -434,15 +432,7 @@ def test_td_div_numeric_scalar(self):
         "nan",
         [
             np.nan,
-            pytest.param(
-                np.float64("NaN"),
-                marks=pytest.mark.xfail(
-                    # Works on numpy dev only in python 3.9
-                    is_numpy_dev and not compat.PY39,
-                    raises=RuntimeWarning,
-                    reason="https://github.com/pandas-dev/pandas/issues/31992",
-                ),
-            ),
+            np.float64("NaN"),
             float("nan"),
         ],
     )