Remove UP035 from ruff ignore list

pyiceberg/avro/codecs/__init__.py

@@ -26,9 +26,7 @@
 
 from __future__ import annotations
 
-from typing import Literal
-
-from typing_extensions import TypeAlias
+from typing import Literal, TypeAlias
 
 from pyiceberg.avro.codecs.bzip2 import BZip2Codec
 from pyiceberg.avro.codecs.codec import Codec

pyiceberg/avro/file.py

@@ -22,11 +22,11 @@
 import io
 import json
 import os
+from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
 from types import TracebackType
 from typing import (
-    Callable,
     Generic,
     TypeVar,
 )

pyiceberg/avro/reader.py

@@ -27,13 +27,12 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from collections.abc import Callable, Mapping
 from dataclasses import dataclass
 from dataclasses import field as dataclassfield
 from decimal import Decimal
 from typing import (
     Any,
-    Callable,
-    Mapping,
 )
 from uuid import UUID
 

pyiceberg/avro/resolver.py

@@ -15,10 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 # pylint: disable=arguments-renamed,unused-argument
+from collections.abc import Callable
 from enum import Enum
-from typing import (
-    Callable,
-)
 
 from pyiceberg.avro.decoder import BinaryDecoder
 from pyiceberg.avro.reader import (

pyiceberg/catalog/__init__.py

@@ -22,12 +22,12 @@
 import re
 import uuid
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     cast,
 )
 

pyiceberg/cli/console.py

@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 # pylint: disable=broad-except,redefined-builtin,redefined-outer-name
+from collections.abc import Callable
 from functools import wraps
 from typing import (
     Any,
-    Callable,
     Literal,
 )
 

pyiceberg/conversions.py

@@ -31,13 +31,13 @@
 
 import codecs
 import uuid
+from collections.abc import Callable
 from datetime import date, datetime, time
 from decimal import Decimal
 from functools import singledispatch
 from struct import Struct
 from typing import (
     Any,
-    Callable,
 )
 
 from pyiceberg.typedef import UTF8, L

pyiceberg/expressions/__init__.py

@@ -19,8 +19,9 @@
 
 import builtins
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Iterable, Sequence
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence, cast
+from typing import TYPE_CHECKING, Any, cast
 from typing import Literal as TypingLiteral
 
 from pydantic import ConfigDict, Field

pyiceberg/expressions/visitors.py

@@ -16,10 +16,10 @@
 # under the License.
 import math
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from functools import singledispatch
 from typing import (
     Any,
-    Callable,
     Generic,
     SupportsFloat,
     TypeVar,

pyiceberg/io/fsspec.py

@@ -22,12 +22,12 @@
 import logging
 import os
 import threading
+from collections.abc import Callable
 from copy import copy
 from functools import lru_cache
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
 )
 from urllib.parse import urlparse
 

pyiceberg/io/pyarrow.py

@@ -37,17 +37,15 @@
 import uuid
 import warnings
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Iterable, Iterator
 from copy import copy
 from dataclasses import dataclass
 from enum import Enum
 from functools import lru_cache, singledispatch
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Generic,
-    Iterable,
-    Iterator,
     TypeVar,
     cast,
 )

pyiceberg/manifest.py

@@ -19,12 +19,12 @@
 import math
 import threading
 from abc import ABC, abstractmethod
+from collections.abc import Iterator
 from copy import copy
 from enum import Enum
 from types import TracebackType
 from typing import (
     Any,
-    Iterator,
     Literal,
 )
 

pyiceberg/schema.py

@@ -20,12 +20,12 @@
 import builtins
 import itertools
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import cached_property, partial, singledispatch
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Generic,
     Literal,
     TypeVar,

pyiceberg/serializers.py

@@ -19,7 +19,7 @@
 import codecs
 import gzip
 from abc import ABC, abstractmethod
-from typing import Callable
+from collections.abc import Callable
 
 from pyiceberg.io import InputFile, InputStream, OutputFile
 from pyiceberg.table.metadata import TableMetadata, TableMetadataUtil

pyiceberg/table/__init__.py

@@ -21,16 +21,14 @@
 import uuid
 import warnings
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Iterable, Iterator
 from dataclasses import dataclass
 from functools import cached_property
 from itertools import chain
 from types import TracebackType
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Iterable,
-    Iterator,
     TypeVar,
 )
 

pyiceberg/table/inspect.py

@@ -17,8 +17,9 @@
 from __future__ import annotations
 
 import itertools
+from collections.abc import Iterator
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Iterator
+from typing import TYPE_CHECKING, Any
 
 from pyiceberg.conversions import from_bytes
 from pyiceberg.expressions import AlwaysTrue, BooleanExpression

pyiceberg/table/name_mapping.py

@@ -26,8 +26,9 @@
 import builtins
 from abc import ABC, abstractmethod
 from collections import ChainMap
+from collections.abc import Iterator
 from functools import cached_property, singledispatch
-from typing import Any, Generic, Iterator, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pydantic import Field, conlist, field_validator, model_serializer
 

pyiceberg/table/snapshots.py

@@ -19,8 +19,9 @@
 import time
 import warnings
 from collections import defaultdict
+from collections.abc import Iterable, Mapping
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Iterable, Mapping
+from typing import TYPE_CHECKING, Any
 
 from pydantic import Field, PrivateAttr, model_serializer
 

pyiceberg/table/sorting.py

@@ -15,8 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 # pylint: disable=keyword-arg-before-vararg
+from collections.abc import Callable
 from enum import Enum
-from typing import Annotated, Any, Callable
+from typing import Annotated, Any
 
 from pydantic import (
     BeforeValidator,

pyiceberg/table/update/snapshot.py

@@ -21,10 +21,11 @@
 import uuid
 from abc import abstractmethod
 from collections import defaultdict
+from collections.abc import Callable
 from concurrent.futures import Future
 from datetime import datetime
 from functools import cached_property
-from typing import TYPE_CHECKING, Callable, Generic
+from typing import TYPE_CHECKING, Generic
 
 from sortedcontainers import SortedList
 

pyiceberg/table/update/validate.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from typing import Iterator
+from collections.abc import Iterator
 
 from pyiceberg.exceptions import ValidationException
 from pyiceberg.expressions import BooleanExpression

pyiceberg/transforms.py

@@ -21,9 +21,10 @@
 import struct
 import types
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from enum import IntEnum
 from functools import singledispatch
-from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
 from typing import Literal as LiteralType
 from uuid import UUID
 

pyiceberg/typedef.py

@@ -17,23 +17,24 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from collections.abc import Callable
 from datetime import date, datetime, time
 from decimal import Decimal
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Generic,
     Literal,
     Protocol,
+    TypeAlias,
     TypeVar,
     Union,
     runtime_checkable,
 )
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, RootModel
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self
 
 if TYPE_CHECKING:
     from pyiceberg.types import StructType

pyiceberg/utils/bin_packing.py

@@ -16,10 +16,9 @@
 # under the License.
 from __future__ import annotations
 
+from collections.abc import Callable, Iterable
 from typing import (
-    Callable,
     Generic,
-    Iterable,
     TypeVar,
 )
 

pyiceberg/utils/deprecated.py

@@ -16,7 +16,8 @@
 #  under the License.
 import functools
 import warnings
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 
 def deprecated(deprecated_in: str, removed_in: str, help_message: str | None = None) -> Callable:  # type: ignore

pyiceberg/utils/lazydict.py

@@ -15,10 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from collections.abc import Iterator, Mapping, Sequence
 from typing import (
-    Iterator,
-    Mapping,
-    Sequence,
     TypeVar,
     cast,
 )

ruff.toml

@@ -58,8 +58,7 @@ select = [
     "UP", # pyupgrade
 ]
 ignore = [
-    "E501",
-    "UP035"
+    "E501"
 ]
 
 # Allow autofix for all enabled rules (when `--fix`) is provided.

tests/avro/test_decoder.py

@@ -18,9 +18,9 @@
 
 import itertools
 import struct
+from collections.abc import Callable
 from io import SEEK_SET
 from types import TracebackType
-from typing import Callable
 from unittest.mock import MagicMock, patch
 
 import pytest

tests/avro/test_reader.py

@@ -16,7 +16,7 @@
 # under the License.
 # pylint:disable=protected-access
 import json
-from typing import Callable
+from collections.abc import Callable
 
 import pytest
 

tests/catalog/integration_test_dynamodb.py

@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from typing import Generator
+from collections.abc import Generator
 
 import boto3
 import pytest

tests/catalog/integration_test_glue.py

@@ -16,7 +16,8 @@
 #  under the License.
 
 import time
-from typing import Any, Generator
+from collections.abc import Generator
+from typing import Any
 from uuid import uuid4
 
 import boto3