Rebase to account for c3c04e2

Author: WillAyd

pandas/tests/categorical/test_api.py

@@ -404,11 +404,6 @@ def test_deprecated_labels(self):
             res = cat.labels
         tm.assert_numpy_array_equal(res, exp)
 
-    def test_deprecated_from_array(self):
-        # GH13854, `.from_array` is deprecated
-        with tm.assert_produces_warning(FutureWarning):
-            Categorical.from_array([0, 1])
-
 
 class TestCategoricalAPIWithFactor(TestCategorical):
 

pandas/tests/categorical/test_subclass.py

@@ -12,7 +12,7 @@ def test_constructor(self):
         assert isinstance(sc, tm.SubclassedCategorical)
         tm.assert_categorical_equal(sc, Categorical(['a', 'b', 'c']))
 
-    def test_from_array(self):
+    def test_from_codes(self):
         sc = tm.SubclassedCategorical.from_codes([1, 0, 2], ['a', 'b', 'c'])
         assert isinstance(sc, tm.SubclassedCategorical)
         exp = Categorical.from_codes([1, 0, 2], ['a', 'b', 'c'])