try to import UndefinedVariableError from the new location (#6701)

* try to import `UndefinedVariableError` from the new location

* [test-upstream]

* mention when to clean up [test-upstream]

Author: keewis

xarray/tests/test_dataarray.py

@@ -11,7 +11,6 @@
 import pandas as pd
 import pytest
 from packaging.version import Version
-from pandas.core.computation.ops import UndefinedVariableError
 
 import xarray as xr
 from xarray import (
@@ -52,6 +51,13 @@
     source_ndarray,
 )
 
+try:
+    from pandas.errors import UndefinedVariableError
+except ImportError:
+    # TODO: remove once we stop supporting pandas<1.4.3
+    from pandas.core.computation.ops import UndefinedVariableError
+
+
 pytestmark = [
     pytest.mark.filterwarnings("error:Mean of empty slice"),
     pytest.mark.filterwarnings("error:All-NaN (slice|axis) encountered"),

xarray/tests/test_dataset.py

@@ -11,7 +11,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-from pandas.core.computation.ops import UndefinedVariableError
 from pandas.core.indexes.datetimes import DatetimeIndex
 
 import xarray as xr
@@ -57,6 +56,13 @@
     source_ndarray,
 )
 
+try:
+    from pandas.errors import UndefinedVariableError
+except ImportError:
+    # TODO: remove once we stop supporting pandas<1.4.3
+    from pandas.core.computation.ops import UndefinedVariableError
+
+
 try:
     import dask.array as da
 except ImportError: