add back ops

pandas-dev · May 29, 2018 · ba74be4 · ba74be4
1 parent d259a22
commit ba74be4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pandas/tests/extension/base/__init__.py b/pandas/tests/extension/base/__init__.py
@@ -46,6 +46,7 @@ class TestMyDtype(BaseDtypeTests):
 from .getitem import BaseGetitemTests  # noqa
 from .groupby import BaseGroupbyTests  # noqa
 from .interface import BaseInterfaceTests  # noqa
+from .ops import BaseOpsTests  # noqa
 from .methods import BaseMethodsTests  # noqa
 from .missing import BaseMissingTests  # noqa
 from .reshaping import BaseReshapingTests  # noqa

diff --git a/pandas/tests/extension/category/test_categorical.py b/pandas/tests/extension/category/test_categorical.py
@@ -55,8 +55,6 @@ class TestDtype(base.BaseDtypeTests):
     pass
 
 
-<<<<<<< HEAD
-=======
 class TestOps(base.BaseOpsTests):
 
     def test_compare_scalar(self, data, all_compare_operators):
@@ -73,7 +71,6 @@ def test_compare_scalar(self, data, all_compare_operators):
                 getattr(data, op)(0)
 
 
->>>>>>> ENH: add ops to extension array
 class TestInterface(base.BaseInterfaceTests):
     @pytest.mark.skip(reason="Memory usage doesn't match")
     def test_memory_usage(self):

diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py
@@ -99,8 +99,6 @@ class TestInterface(BaseDecimal, base.BaseInterfaceTests):
     pass
 
 
-<<<<<<< HEAD
-=======
 class TestOps(BaseDecimal, base.BaseOpsTests):
 
     def compare(self, s, op, other):
@@ -136,7 +134,6 @@ def test_compare_scalar(self, data, all_compare_operators):
         tm.assert_series_equal(result, expected)
 
 
->>>>>>> ENH: add ops to extension array
 class TestConstructors(BaseDecimal, base.BaseConstructorsTests):
 
     @pytest.mark.xfail(reason="not implemented constructor from dtype")

diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py
@@ -141,6 +141,10 @@ class TestReshaping(BaseJSON, base.BaseReshapingTests):
     pass
 
 
+class TestOps(BaseJSON, base.BaseOpsTests):
+    pass
+
+
 class TestGetitem(BaseJSON, base.BaseGetitemTests):
     pass
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,6 +141,10 @@ class TestReshaping(BaseJSON, base.BaseReshapingTests): @@
         pass
+    class TestOps(BaseJSON, base.BaseOpsTests):
+        pass
     class TestGetitem(BaseJSON, base.BaseGetitemTests):
         pass
@@ Expand Down @@