Update Python version for pyupgrade in pre-commit

.pre-commit-config.yaml

@@ -57,7 +57,7 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - --py37-plus
+          - --py310-plus
           - --keep-runtime-typing
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.7

cosmos/_triggers/watcher.py

@@ -4,7 +4,8 @@
 import base64
 import json
 import zlib
-from typing import Any, AsyncIterator
+from collections.abc import AsyncIterator
+from typing import Any
 
 from airflow.triggers.base import BaseTrigger, TriggerEvent
 from asgiref.sync import sync_to_async

cosmos/_utils/importer.py

@@ -1,5 +1,6 @@
 import importlib
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 
 def load_method_from_module(module_path: str, method_name: str) -> Callable[..., Any]:

cosmos/airflow/graph.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from collections import OrderedDict, defaultdict
+from collections.abc import Callable
 from copy import deepcopy
-from typing import Any, Callable
+from typing import Any
 
 try:  # Airflow 3
     from airflow.sdk.bases.operator import BaseOperator

cosmos/config.py

@@ -6,9 +6,10 @@
 import shutil
 import tempfile
 import warnings
+from collections.abc import Callable, Iterator
 from dataclasses import InitVar, dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Iterator
+from typing import TYPE_CHECKING, Any
 
 import yaml
 from airflow.version import version as airflow_version

cosmos/constants.py

@@ -1,7 +1,7 @@
 import os
+from collections.abc import Callable
 from enum import Enum
 from pathlib import Path
-from typing import Callable
 
 import aenum
 import airflow

cosmos/converter.py

@@ -8,7 +8,8 @@
 import os
 import platform
 import time
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 from warnings import warn
 
 from airflow.models.dag import DAG

cosmos/dbt/project.py

@@ -2,9 +2,9 @@
 
 import os
 import shutil
+from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Generator
 
 import yaml
 

cosmos/dbt/runner.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import sys
+from collections.abc import Callable
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from cosmos.dbt.project import change_working_directory, environ
 from cosmos.exceptions import CosmosDbtRunError

cosmos/hooks/subprocess.py

@@ -7,9 +7,10 @@
 import contextlib
 import os
 import signal
+from collections.abc import Callable
 from subprocess import PIPE, STDOUT, Popen
 from tempfile import TemporaryDirectory, gettempdir
-from typing import Any, Callable, NamedTuple
+from typing import Any, NamedTuple
 
 try:
     # Airflow 3.1 onwards

cosmos/operators/_asynchronous/bigquery.py

@@ -3,8 +3,9 @@
 import base64
 import time
 import zlib
+from collections.abc import Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
 
 from cosmos.operators.base import _sanitize_xcom_key
 

cosmos/operators/_watcher/state.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from threading import Lock
-from typing import Any, Callable
+from typing import Any
 
 try:
     from airflow.sdk.types import RuntimeTaskInstanceProtocol as TaskInstance

cosmos/operators/aws_ecs.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:  # pragma: no cover
     try:

cosmos/operators/aws_eks.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
 from airflow.providers.amazon.aws.hooks.eks import EksHook

cosmos/operators/azure_container_instance.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 try:
     from airflow.sdk.bases.operator import BaseOperator  # Airflow 3

cosmos/operators/base.py

@@ -4,8 +4,9 @@
 import logging
 import os
 from abc import ABCMeta, abstractmethod
+from collections.abc import Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
 
 import yaml
 from airflow.utils.context import context_merge

cosmos/operators/docker.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 try:
     from airflow.sdk.bases.operator import BaseOperator  # Airflow 3

cosmos/operators/gcp_cloud_run_job.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:  # pragma: no cover
     try:

cosmos/operators/kubernetes.py

@@ -3,8 +3,9 @@
 import inspect
 import re
 from abc import ABC
+from collections.abc import Callable, Sequence
 from os import PathLike
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 import kubernetes.client as k8s
 from airflow.providers.cncf.kubernetes.backcompat.backwards_compat_converters import (

cosmos/operators/local.py

@@ -10,9 +10,10 @@
 import warnings
 import zlib
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Sequence
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence
+from typing import TYPE_CHECKING, Any, Literal
 from urllib.parse import urlparse
 
 import jinja2

cosmos/operators/virtualenv.py

@@ -3,9 +3,10 @@
 import os
 import shutil
 import time
+from collections.abc import Callable, Sequence
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from typing import TYPE_CHECKING, Any
 
 import psutil
 

cosmos/operators/watcher.py

@@ -4,9 +4,10 @@
 import json
 import logging
 import zlib
+from collections.abc import Callable
 from datetime import timedelta
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from cosmos._triggers.watcher import WatcherTrigger, _parse_compressed_xcom
 from cosmos.operators._watcher.state import get_xcom_val, safe_xcom_push

cosmos/plugin/airflow3.py

@@ -5,8 +5,9 @@
 import logging
 import os
 import os.path as op
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Any, Generator
+from typing import Any
 from unittest.mock import patch
 from urllib.parse import urlsplit
 

cosmos/profiles/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Type
+from typing import Any
 
 from .athena import AthenaAccessKeyProfileMapping
 from .base import BaseProfileMapping, DbtProfileConfigVars
@@ -30,7 +30,7 @@
 from .trino.ldap import TrinoLDAPProfileMapping
 from .vertica.user_pass import VerticaUserPasswordProfileMapping
 
-profile_mappings: list[Type[BaseProfileMapping]] = [
+profile_mappings: list[type[BaseProfileMapping]] = [
     AthenaAccessKeyProfileMapping,
     ClickhouseUserPasswordProfileMapping,
     GoogleCloudServiceAccountFileProfileMapping,

docs/generate_mappings.py

@@ -6,7 +6,6 @@
 
 import os
 from dataclasses import dataclass
-from typing import Type
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -22,7 +21,7 @@ class Field:
     airflow_name: str | list[str] | None = None
 
 
-def get_fields_from_mapping(mapping: Type[BaseProfileMapping]) -> list[Field]:
+def get_fields_from_mapping(mapping: type[BaseProfileMapping]) -> list[Field]:
     """
     Generates Field objects from a profile mapping.
     """

tests/dbt/parser/test_project.py

@@ -4,7 +4,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import List
 from unittest.mock import patch
 
 import pytest
@@ -155,7 +154,7 @@ class KeywordArgValueStr(KeywordArgValue, str):
 @dataclass
 class KeywordArg:
     key: str
-    value: KeywordArgValue | List
+    value: KeywordArgValue | list
 
 
 def test_dbtmodelconfig_extract_config_non_kwarg():

tests/perf/test_performance.py

@@ -2,10 +2,10 @@
 
 import os
 import time
+from collections.abc import Generator
 from contextlib import contextmanager
 from functools import cache
 from pathlib import Path
-from typing import Generator
 
 import pytest
 from airflow.models.dagbag import DagBag