TST: Fix issues due to changes in tests

Author: bashtage

pandas-stubs/core/base.pyi

@@ -17,10 +17,6 @@ from pandas._typing import (
     npt,
 )
 
-# TODO: These two moved to pandas.errors after switch to 1.5.x
-class DataError(Exception): ...
-class SpecificationError(Exception): ...
-
 class PandasObject(DirNamesMixin):
     def __sizeof__(self) -> int: ...
 

pandas-stubs/core/common.pyi

@@ -5,10 +5,6 @@ from typing import (
 
 from pandas._typing import T
 
-# TODO: Remove from here after 1.5.x is target, moved to pandas.errors
-class SettingWithCopyError(ValueError): ...
-class SettingWithCopyWarning(Warning): ...
-
 def flatten(line) -> None: ...
 def consensus_name_attr(objs): ...
 def is_bool_indexer(key) -> bool: ...

pandas-stubs/core/computation/engines.pyi

@@ -1,8 +1,5 @@
 import abc
 
-# TODO: Remove from here after 1.5.x, moved to pandas.errors
-class NumExprClobberingError(NameError): ...
-
 class AbstractEngine(metaclass=abc.ABCMeta):
     has_neg_frac: bool = ...
     expr = ...

pandas-stubs/core/indexing.pyi

@@ -24,9 +24,6 @@ class _IndexSlice:
 
 IndexSlice: _IndexSlice
 
-# TODO: Remove from here after 1.5.x, moved to pandas.errors
-class IndexingError(Exception): ...
-
 class IndexingMixin:
     @property
     def iloc(self) -> _iLocIndexer: ...

pandas-stubs/errors/__init__.pyi

@@ -1,15 +1,12 @@
+from pandas.core.computation.ops import UndefinedVariableError as UndefinedVariableError
+
 from pandas._config.config import OptionError as OptionError
 
 from pandas._libs.tslibs import (
     OutOfBoundsDatetime as OutOfBoundsDatetime,
     OutOfBoundsTimedelta as OutOfBoundsTimedelta,
 )
 
-from pandas.io.clipboard import PyperclipWindowsException as PyperclipWindowsException
-
-# TODO: Uncomment import below after switch to 1.5.x.
-# from pandas.core.computation.ops import UndefinedVariableError as UndefinedVariableError
-
 class IntCastingNaNError(ValueError): ...
 class NullFrequencyError(ValueError): ...
 class PerformanceWarning(Warning): ...
@@ -28,30 +25,24 @@ class AbstractMethodError(NotImplementedError):
 class NumbaUtilError(Exception): ...
 class DuplicateLabelError(ValueError): ...
 class InvalidIndexError(Exception): ...
+class DataError(Exception): ...
+class SpecificationError(Exception): ...
+class SettingWithCopyError(ValueError): ...
+class SettingWithCopyWarning(Warning): ...
+class NumExprClobberingError(NameError): ...
+class IndexingError(Exception): ...
+class PyperclipException(RuntimeError): ...
+
+class PyperclipWindowsException(PyperclipException):
+    def __init__(self, message) -> None: ...
 
-# TODO: Uncomment and delete from pandas.core.base after switch to 1.5.x
-# class DataError(Exception): ...
-# class SpecificationError(Exception): ...
-# TODO: Uncomment and delete from pandas.core.common after switch to 1.5.x
-# class SettingWithCopyError(ValueError): ...
-# class SettingWithCopyWarning(Warning): ...
-# TODO: Uncomment and delete from pandas.core.computation.engines after switch to 1.5.x
-# class NumExprClobberingError(NameError): ...
-# TODO: Uncomment and delete from core.indexing after switch to 1.5.x
-# class IndexingError(Exception): ...
-# TODO: Uncomment and delete from io.clipboards.__init__ after switch to 1.5.x
-# class PyperclipException(RuntimeError): ...
-# TODO: Uncomment and delete from io.formats.css after switch to 1.5.x
-# class CSSWarning(UserWarning): ...
-# TODO: Uncomment and delete next 4 from io.pytables after switch to 1.5.x
-# class PossibleDataLossError(Exception): ...
-# class ClosedFileError(Exception): ...
-# class IncompatibilityWarning(Warning): ...
-# class AttributeConflictWarning(Warning): ...
-# TODO: Uncomment and delete from io.sql after switch to 1.5.x
-# class DatabaseError(OSError): ...
-# TODO: Uncomment and delete from io.stata after switch to 1.5.x
-# class PossiblePrecisionLoss(Warning): ...
-# class ValueLabelTypeMismatch(Warning): ...
-# class InvalidColumnName(Warning): ...
-# class CategoricalConversionWarning(Warning): ...
+class CSSWarning(UserWarning): ...
+class PossibleDataLossError(Exception): ...
+class ClosedFileError(Exception): ...
+class IncompatibilityWarning(Warning): ...
+class AttributeConflictWarning(Warning): ...
+class DatabaseError(OSError): ...
+class PossiblePrecisionLoss(Warning): ...
+class ValueLabelTypeMismatch(Warning): ...
+class InvalidColumnName(Warning): ...
+class CategoricalConversionWarning(Warning): ...

pandas-stubs/io/clipboard/__init__.pyi

@@ -1,5 +0,0 @@
-# TODO: Remove PyperclipException after switch to 1.5.x, moved to pandas.errors
-class PyperclipException(RuntimeError): ...
-
-class PyperclipWindowsException(PyperclipException):
-    def __init__(self, message) -> None: ...

pandas-stubs/io/formats/css.pyi

@@ -1,2 +0,0 @@
-# TODO: Remove after 1.5.x, moved to pandas.errors
-class CSSWarning(UserWarning): ...

pandas-stubs/io/pytables.pyi

@@ -23,13 +23,6 @@ from pandas._typing import (
 
 Term = PyTablesExpr
 
-# TODO: Remove these after switch to 1.5.x, moved to pandas.errors
-class PossibleDataLossError(Exception): ...
-class ClosedFileError(Exception): ...
-class IncompatibilityWarning(Warning): ...
-class AttributeConflictWarning(Warning): ...
-class DuplicateWarning(Warning): ...
-
 @overload
 def read_hdf(
     path_or_buf: FilePath | HDFStore,

pandas-stubs/io/sql.pyi

@@ -19,9 +19,6 @@ from pandas._typing import (
     npt,
 )
 
-# TODO: Remove after switch to 1.5.x, moved to pandas.errors
-class DatabaseError(IOError): ...
-
 _SQLConnection = Union[
     str,
     sqlalchemy.engine.Connectable,

pandas-stubs/io/stata.pyi

@@ -70,12 +70,6 @@ def read_stata(
     storage_options: StorageOptions = ...,
 ) -> DataFrame: ...
 
-# TODO: Remove after switch to 1.5.x, moved to pandas.errors
-class PossiblePrecisionLoss(Warning): ...
-class ValueLabelTypeMismatch(Warning): ...
-class InvalidColumnName(Warning): ...
-class CategoricalConversionWarning(Warning): ...
-
 class StataParser:
     def __init__(self) -> None: ...