add back ops

Author: jreback

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

pandas/tests/extension/category/test_categorical.py

@@ -57,8 +57,6 @@ def test_array_type_with_arg(self, data, dtype):
         assert dtype.construct_array_type('foo') is Categorical
 
 
-<<<<<<< HEAD
-=======
 class TestOps(base.BaseOpsTests):
 
     def test_compare_scalar(self, data, all_compare_operators):
@@ -75,7 +73,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):

pandas/tests/extension/decimal/test_decimal.py

@@ -101,8 +101,6 @@ class TestInterface(BaseDecimal, base.BaseInterfaceTests):
     pass
 
 
-<<<<<<< HEAD
-=======
 class TestOps(BaseDecimal, base.BaseOpsTests):
 
     def compare(self, s, op, other):
@@ -138,7 +136,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")

pandas/tests/extension/json/test_json.py

@@ -143,6 +143,10 @@ class TestReshaping(BaseJSON, base.BaseReshapingTests):
     pass
 
 
+class TestOps(BaseJSON, base.BaseOpsTests):
+    pass
+
+
 class TestGetitem(BaseJSON, base.BaseGetitemTests):
     pass