chore: Enable Ruff UP and FA rules (#409)

Author: edgarrmondragon

pyproject.toml

@@ -83,10 +83,12 @@ select = [
   "F",   # Pyflakes
   "W",   # pycodestyle warnings
   "E",   # pycodestyle errors
+  "FA",  # flake8-future-annotations
   "I",   # isort
   "N",   # pep8-naming
   "D",   # pydocsyle
   "ICN", # flake8-import-conventions
+  "UP",  # pyupgrade
   "RUF", # ruff
 ]
 

target_postgres/sinks.py

@@ -1,8 +1,10 @@
 """Postgres target sink class, which handles writing streams."""
 
+from __future__ import annotations
+
 import datetime
+import typing as t
 import uuid
-from typing import Any, Dict, Iterable, List, Optional, Sequence, Union, cast
 
 import sqlalchemy as sa
 from singer_sdk.sinks import SQLSink
@@ -39,7 +41,7 @@ def connector(self) -> PostgresConnector:
         Returns:
             The connector object.
         """
-        return cast(PostgresConnector, self._connector)
+        return t.cast(PostgresConnector, self._connector)
 
     def setup(self) -> None:
         """Set up Sink.
@@ -120,10 +122,10 @@ def bulk_insert_records(  # type: ignore[override]
         self,
         table: sa.Table,
         schema: dict,
-        records: Iterable[Dict[str, Any]],
-        primary_keys: Sequence[str],
+        records: t.Iterable[dict[str, t.Any]],
+        primary_keys: t.Sequence[str],
         connection: sa.engine.Connection,
-    ) -> Optional[int]:
+    ) -> int | None:
         """Bulk insert records to an existing destination table.
 
         The default implementation uses a generic SQLAlchemy bulk insert operation.
@@ -142,7 +144,7 @@ def bulk_insert_records(  # type: ignore[override]
             True if table exists, False if not, None if unsure or undetectable.
         """
         columns = self.column_representation(schema)
-        insert: str = cast(
+        insert: str = t.cast(
             str,
             self.generate_insert_statement(
                 table.name,
@@ -151,10 +153,10 @@ def bulk_insert_records(  # type: ignore[override]
         )
         self.logger.info("Inserting with SQL: %s", insert)
         # Only one record per PK, we want to take the last one
-        data_to_insert: List[Dict[str, Any]] = []
+        data_to_insert: list[dict[str, t.Any]] = []
 
         if self.append_only is False:
-            insert_records: Dict[str, Dict] = {}  # pk : record
+            insert_records: dict[str, dict] = {}  # pk : record
             for record in records:
                 insert_record = {}
                 for column in columns:
@@ -178,9 +180,9 @@ def upsert(
         from_table: sa.Table,
         to_table: sa.Table,
         schema: dict,
-        join_keys: Sequence[str],
+        join_keys: t.Sequence[str],
         connection: sa.engine.Connection,
-    ) -> Optional[int]:
+    ) -> int | None:
         """Merge upsert data from one table to another.
 
         Args:
@@ -247,7 +249,7 @@ def upsert(
     def column_representation(
         self,
         schema: dict,
-    ) -> List[sa.Column]:
+    ) -> list[sa.Column]:
         """Return a sqlalchemy table representation for the current schema."""
         columns: list[sa.Column] = []
         for property_name, property_jsonschema in schema["properties"].items():
@@ -262,8 +264,8 @@ def column_representation(
     def generate_insert_statement(
         self,
         full_table_name: str,
-        columns: List[sa.Column],  # type: ignore[override]
-    ) -> Union[str, Executable]:
+        columns: list[sa.Column],  # type: ignore[override]
+    ) -> str | Executable:
         """Generate an insert statement for the given records.
 
         Args:
@@ -277,12 +279,12 @@ def generate_insert_statement(
         table = sa.Table(full_table_name, metadata, *columns)
         return sa.insert(table)
 
-    def conform_name(self, name: str, object_type: Optional[str] = None) -> str:
+    def conform_name(self, name: str, object_type: str | None = None) -> str:
         """Conforming names of tables, schemas, column names."""
         return name
 
     @property
-    def schema_name(self) -> Optional[str]:
+    def schema_name(self) -> str | None:
         """Return the schema name or `None` if using names with no schema part.
 
                 Note that after the next SDK release (after 0.14.0) we can remove this

target_postgres/tests/samples/sample_tap_countries/countries_tap.py

@@ -6,7 +6,7 @@
   - https://countries.trevorblades.com/
 """
 
-from typing import List
+from __future__ import annotations
 
 from singer_sdk import Stream, Tap
 from singer_sdk.typing import PropertiesList
@@ -23,7 +23,7 @@ class SampleTapCountries(Tap):
     name: str = "sample-tap-countries"
     config_jsonschema = PropertiesList().to_dict()
 
-    def discover_streams(self) -> List[Stream]:
+    def discover_streams(self) -> list[Stream]:
         """Return a list of discovered streams."""
         return [
             CountriesStream(tap=self),