pin pandas to 1.2.3

rapidsai · Mar 3, 2021 · 48cb295 · 48cb295
1 parent 61ccf0f
commit 48cb295
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/conda/environments/cudf_dev_cuda10.1.yml b/conda/environments/cudf_dev_cuda10.1.yml
@@ -17,7 +17,7 @@ dependencies:
   - python>=3.6,<3.8
   - numba>=0.49.0,!=0.51.0
   - numpy
-  - pandas>=1.0,<=1.2.2
+  - pandas>=1.0,<=1.2.3
   - pyarrow=1.0.1
   - fastavro>=0.22.9
   - notebook>=0.5.0

diff --git a/conda/environments/cudf_dev_cuda10.2.yml b/conda/environments/cudf_dev_cuda10.2.yml
@@ -17,7 +17,7 @@ dependencies:
   - python>=3.6,<3.8
   - numba>=0.49,!=0.51.0
   - numpy
-  - pandas>=1.0,<=1.2.2
+  - pandas>=1.0,<=1.2.3
   - pyarrow=1.0.1
   - fastavro>=0.22.9
   - notebook>=0.5.0

diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml
@@ -17,7 +17,7 @@ dependencies:
   - python>=3.6,<3.8
   - numba>=0.49,!=0.51.0
   - numpy
-  - pandas>=1.0,<=1.2.2
+  - pandas>=1.0,<=1.2.3
   - pyarrow=1.0.1
   - fastavro>=0.22.9
   - notebook>=0.5.0

diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml
@@ -35,7 +35,7 @@ requirements:
     - protobuf
     - python
     - typing_extensions
-    - pandas >=1.0,<=1.2.2
+    - pandas >=1.0,<=1.2.3
     - cupy >7.1.0,<9.0.0a0
     - numba >=0.49.0
     - numpy

diff --git a/python/cudf/cudf/core/_compat.py b/python/cudf/cudf/core/_compat.py
@@ -7,3 +7,4 @@
 PANDAS_GE_100 = PANDAS_VERSION >= version.parse("1.0")
 PANDAS_GE_110 = PANDAS_VERSION >= version.parse("1.1")
 PANDAS_GE_120 = PANDAS_VERSION >= version.parse("1.2")
+PANDAS_EQ_123 = PANDAS_VERSION == version.parse("1.2.3")
diff --git a/python/cudf/cudf/tests/test_setitem.py b/python/cudf/cudf/tests/test_setitem.py
@@ -5,7 +5,7 @@
 import pytest
 
 import cudf
-from cudf.core._compat import PANDAS_GE_120
+from cudf.core._compat import PANDAS_EQ_123, PANDAS_GE_120
 from cudf.tests.utils import assert_eq, assert_exceptions_equal
 
 
@@ -21,9 +21,8 @@ def test_dataframe_setitem_bool_mask_scaler(df, arg, value):
 
 
 @pytest.mark.xfail(
-    condition=not PANDAS_GE_120,
-    reason="pandas incorrectly adds nulls with dataframes "
-    "but works fine with scalars",
+    condition=PANDAS_EQ_123 or not PANDAS_GE_120,
+    reason="https://github.com/pandas-dev/pandas/issues/40204",
 )
 def test_dataframe_setitem_scaler_bool():
     df = pd.DataFrame({"a": [1, 2, 3]})