Remove column fixtures

Author: kotamatsuoka

pandas/core/internals/construction.py

@@ -242,10 +242,11 @@ def init_dict(data, index, columns, dtype=None):
 
         # no obvious "empty" int column
         if missing.any() and not is_integer_dtype(dtype):
-            if is_extension_array_dtype(dtype):
-                # GH 33623
-                nan_dtype = dtype
-            elif dtype is None or np.issubdtype(dtype, np.flexible):
+            if (
+                dtype is None
+                or is_extension_array_dtype(dtype)
+                or np.issubdtype(dtype, np.flexible)
+            ):
                 # GH#1783
                 nan_dtype = object
             else:

pandas/tests/extension/arrow/test_bool.py

@@ -15,13 +15,6 @@ def dtype():
     return ArrowBoolDtype()
 
 
-@pytest.fixture
-def columns():
-    values = np.random.randint(0, 2, size=100, dtype=bool)
-    values[1] = ~values[0]
-    return ArrowBoolArray.from_scalars(values)
-
-
 @pytest.fixture
 def data():
     values = np.random.randint(0, 2, size=100, dtype=bool)
@@ -63,8 +56,8 @@ def test_from_sequence_from_cls(self, data):
         super().test_from_sequence_from_cls(data)
 
     @pytest.mark.xfail(reason="bad is-na for empty data")
-    def test_construct_empty_dataframe(self, columns, dtype):
-        super().test_construct_empty_dataframe(columns, dtype)
+    def test_construct_empty_dataframe(self, dtype):
+        super().test_construct_empty_dataframe(dtype)
 
 
 class TestReduce(base.BaseNoReduceTests):

pandas/tests/extension/base/constructors.py

@@ -84,6 +84,8 @@ def test_pandas_array_dtype(self, data):
         expected = pd.arrays.PandasArray(np.asarray(data, dtype=object))
         self.assert_equal(result, expected)
 
-    def test_construct_empty_dataframe(self, columns, dtype):
+    def test_construct_empty_dataframe(self, dtype):
         # GH 33623
-        pd.DataFrame(columns=columns, dtype=dtype)
+        result = pd.DataFrame(columns=["a"], dtype=dtype)
+        expected = pd.DataFrame(data=[], columns=["a"], dtype=dtype)
+        self.assert_frame_equal(result, expected)

pandas/tests/extension/decimal/test_decimal.py

@@ -17,11 +17,6 @@ def dtype():
     return DecimalDtype()
 
 
-@pytest.fixture
-def columns():
-    return DecimalArray(make_data())
-
-
 @pytest.fixture
 def data():
     return DecimalArray(make_data())

pandas/tests/extension/json/test_json.py

@@ -15,16 +15,6 @@ def dtype():
     return JSONDtype()
 
 
-@pytest.fixture
-def columns():
-    data = make_data()
-
-    while len(data[0]) == len(data[1]):
-        data = make_data()
-
-    return JSONArray(data)
-
-
 @pytest.fixture
 def data():
     """Length-100 PeriodArray for semantics test."""

pandas/tests/extension/test_boolean.py

@@ -33,11 +33,6 @@ def dtype():
     return BooleanDtype()
 
 
-@pytest.fixture
-def columns(dtype):
-    return pd.array([True, False], dtype=dtype)
-
-
 @pytest.fixture
 def data(dtype):
     return pd.array(make_data(), dtype=dtype)

pandas/tests/extension/test_categorical.py

@@ -41,11 +41,6 @@ def dtype():
     return CategoricalDtype()
 
 
-@pytest.fixture
-def columns():
-    return Categorical(make_data())
-
-
 @pytest.fixture
 def data():
     """Length-100 array for this type.

pandas/tests/extension/test_datetime.py

@@ -13,11 +13,6 @@ def dtype(request):
     return DatetimeTZDtype(unit="ns", tz=request.param)
 
 
-@pytest.fixture
-def columns(dtype):
-    return DatetimeArray(pd.date_range("2000", periods=100, tz=dtype.tz), dtype=dtype)
-
-
 @pytest.fixture
 def data(dtype):
     data = DatetimeArray(pd.date_range("2000", periods=100, tz=dtype.tz), dtype=dtype)

pandas/tests/extension/test_integer.py

@@ -54,11 +54,6 @@ def dtype(request):
     return request.param()
 
 
-@pytest.fixture
-def columns():
-    return integer_array(make_data())
-
-
 @pytest.fixture
 def data(dtype):
     return integer_array(make_data(), dtype=dtype)
@@ -192,8 +187,8 @@ class TestInterface(base.BaseInterfaceTests):
 
 class TestConstructors(base.BaseConstructorsTests):
     @pytest.mark.xfail(reason="bad is-na for empty data")
-    def test_construct_empty_dataframe(self, columns, dtyoe):
-        super().test_construct_empty_dataframe(columns, dtype)
+    def test_construct_empty_dataframe(self, dtype):
+        super().test_construct_empty_dataframe(dtype)
 
 
 class TestReshaping(base.BaseReshapingTests):

pandas/tests/extension/test_interval.py

@@ -35,11 +35,6 @@ def dtype():
     return IntervalDtype()
 
 
-@pytest.fixture
-def columns():
-    return IntervalArray(make_data())
-
-
 @pytest.fixture
 def data():
     """Length-100 PeriodArray for semantics test."""
@@ -88,7 +83,9 @@ class TestCasting(BaseInterval, base.BaseCastingTests):
 
 
 class TestConstructors(BaseInterval, base.BaseConstructorsTests):
-    pass
+    @pytest.mark.xfail(reason="bad is-na for empty data")
+    def test_construct_empty_dataframe(self, dtype):
+        super().test_construct_empty_dataframe(dtype)
 
 
 class TestGetitem(BaseInterval, base.BaseGetitemTests):

pandas/tests/extension/test_numpy.py

@@ -37,11 +37,6 @@ def allow_in_pandas(monkeypatch):
         yield
 
 
-@pytest.fixture
-def columns():
-    return PandasArray(np.arange(1, 3))
-
-
 @pytest.fixture
 def data(allow_in_pandas, dtype):
     if dtype.numpy_dtype == "object":

pandas/tests/extension/test_period.py

@@ -15,11 +15,6 @@ def dtype():
     return PeriodDtype(freq="D")
 
 
-@pytest.fixture
-def columns(dtype):
-    return PeriodArray(np.arange(2020, 2021), freq=dtype.freq)
-
-
 @pytest.fixture
 def data(dtype):
     return PeriodArray(np.arange(1970, 2070), freq=dtype.freq)

pandas/tests/extension/test_sparse.py

@@ -29,11 +29,6 @@ def dtype():
     return SparseDtype()
 
 
-@pytest.fixture
-def columns():
-    return SparseArray(np.ones(10) * 2)
-
-
 @pytest.fixture(params=[0, np.nan])
 def data(request):
     """Length-100 PeriodArray for semantics test."""

pandas/tests/extension/test_string.py

@@ -13,13 +13,6 @@ def dtype():
     return StringDtype()
 
 
-@pytest.fixture
-def columns():
-    strings = np.random.choice(list(string.ascii_letters), size=1)
-
-    return StringArray._from_sequence(strings)
-
-
 @pytest.fixture
 def data():
     strings = np.random.choice(list(string.ascii_letters), size=100)