[airflow] branch main updated: Refactor: Consolidate import re (#34188)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 77dd4f04e2 Refactor: Consolidate import re (#34188)
77dd4f04e2 is described below

commit 77dd4f04e23323799dac5660b6998b218a8fdc03
Author: Miroslav Šedivý <67...@users.noreply.github.com>
AuthorDate: Mon Sep 11 21:21:14 2023 +0000

    Refactor: Consolidate import re (#34188)
---
 .../src/airflow_breeze/commands/release_management_commands.py       | 5 ++---
 dev/breeze/src/airflow_breeze/utils/custom_param_types.py            | 4 ++--
 dev/breeze/src/airflow_breeze/utils/selective_checks.py              | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
index daa04f0448..2e642a49a2 100644
--- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -26,7 +26,6 @@ import time
 from copy import deepcopy
 from datetime import datetime
 from pathlib import Path
-from re import Pattern, match
 from typing import IO, Generator, NamedTuple
 
 import click
@@ -516,7 +515,7 @@ WHEEL_FILENAME_PATTERN = re.compile(rf"{WHEEL_FILENAME_PREFIX}(.*)-[0-9].*\.whl"
 
 
 def _get_all_providers_in_dist(
-    filename_prefix: str, filename_pattern: Pattern[str]
+    filename_prefix: str, filename_pattern: re.Pattern[str]
 ) -> Generator[str, None, None]:
     for file in DIST_DIR.glob(f"{filename_prefix}*.tar.gz"):
         matched = filename_pattern.match(file.name)
@@ -981,7 +980,7 @@ def release_prod_images(
     perform_environment_checks()
     check_remote_ghcr_io_commands()
     rebuild_or_pull_ci_image_if_needed(command_params=ShellParams(python=DEFAULT_PYTHON_MAJOR_MINOR_VERSION))
-    if not match(r"^\d*\.\d*\.\d*$", airflow_version):
+    if not re.match(r"^\d*\.\d*\.\d*$", airflow_version):
         get_console().print(
             f"[warning]Skipping latest image tagging as this is a pre-release version: {airflow_version}"
         )
diff --git a/dev/breeze/src/airflow_breeze/utils/custom_param_types.py b/dev/breeze/src/airflow_breeze/utils/custom_param_types.py
index d2be85aa3b..f4983aa33f 100644
--- a/dev/breeze/src/airflow_breeze/utils/custom_param_types.py
+++ b/dev/breeze/src/airflow_breeze/utils/custom_param_types.py
@@ -16,8 +16,8 @@
 # under the License.
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass
-from re import match
 from typing import Any, Sequence
 
 import click
@@ -221,6 +221,6 @@ class UseAirflowVersionType(BetterChoice):
         self.all_choices = [*self.choices, "<airflow_version>"]
 
     def convert(self, value, param, ctx):
-        if match(r"^\d*\.\d*\.\d*\S*$", value):
+        if re.match(r"^\d*\.\d*\.\d*\S*$", value):
             return value
         return super().convert(value, param, ctx)
diff --git a/dev/breeze/src/airflow_breeze/utils/selective_checks.py b/dev/breeze/src/airflow_breeze/utils/selective_checks.py
index a1c6e1ce1e..0c498bae7e 100644
--- a/dev/breeze/src/airflow_breeze/utils/selective_checks.py
+++ b/dev/breeze/src/airflow_breeze/utils/selective_checks.py
@@ -18,10 +18,10 @@ from __future__ import annotations
 
 import json
 import os
+import re
 import sys
 from enum import Enum
 from functools import cached_property, lru_cache
-from re import match
 from typing import Any, Dict, List, TypeVar
 
 from typing_extensions import Literal
@@ -471,7 +471,7 @@ class SelectiveChecks:
     def _match_files_with_regexps(self, matched_files, regexps):
         for file in self._files:
             for regexp in regexps:
-                if match(regexp, file):
+                if re.match(regexp, file):
                     matched_files.append(file)
                     break