[airflow] branch main updated: Re-enable `pymsql` on ARM as it now builds cleanly (#28530)

[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 78238d51ee Re-enable `pymsql` on ARM as it now builds cleanly (#28530)
78238d51ee is described below

commit 78238d51ee4b0fdba28bb8f24e0a0402c2ef2922
Author: Andrey Anshin <An...@taragol.is>
AuthorDate: Thu Dec 22 14:00:13 2022 +0400

    Re-enable `pymsql` on ARM as it now builds cleanly (#28530)
---
 airflow/providers/microsoft/mssql/provider.yaml              | 2 +-
 dev/breeze/src/airflow_breeze/commands/developer_commands.py | 2 +-
 generated/provider_dependencies.json                         | 2 +-
 scripts/in_container/run_provider_yaml_files_check.py        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airflow/providers/microsoft/mssql/provider.yaml b/airflow/providers/microsoft/mssql/provider.yaml
index 226552ecd6..aa8b3ea3c5 100644
--- a/airflow/providers/microsoft/mssql/provider.yaml
+++ b/airflow/providers/microsoft/mssql/provider.yaml
@@ -41,7 +41,7 @@ versions:
 dependencies:
   - apache-airflow>=2.3.0
   - apache-airflow-providers-common-sql>=1.3.1
-  - pymssql>=2.1.5; platform_machine != "aarch64"
+  - pymssql>=2.1.5
 
 integrations:
   - integration-name: Microsoft SQL Server (MSSQL)
diff --git a/dev/breeze/src/airflow_breeze/commands/developer_commands.py b/dev/breeze/src/airflow_breeze/commands/developer_commands.py
index ca3fd3fdcc..3904fc12e5 100644
--- a/dev/breeze/src/airflow_breeze/commands/developer_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/developer_commands.py
@@ -549,7 +549,7 @@ def enter_shell(**kwargs) -> RunCommandResult:
             sys.exit(1)
         if shell_params.backend == "mssql":
             get_console().print("\n[error]MSSQL is not supported on ARM architecture[/]\n")
-            return 1
+            sys.exit(1)
     command_result = run_command(
         cmd, env=env_variables, text=True, check=False, output_outside_the_group=True
     )
diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
index 95f212444e..4c5ba768f3 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -465,7 +465,7 @@
     "deps": [
       "apache-airflow-providers-common-sql>=1.3.1",
       "apache-airflow>=2.3.0",
-      "pymssql>=2.1.5; platform_machine != \"aarch64\""
+      "pymssql>=2.1.5"
     ],
     "cross-providers-deps": [
       "common.sql"
diff --git a/scripts/in_container/run_provider_yaml_files_check.py b/scripts/in_container/run_provider_yaml_files_check.py
index cab365eb21..b0edb333d4 100755
--- a/scripts/in_container/run_provider_yaml_files_check.py
+++ b/scripts/in_container/run_provider_yaml_files_check.py
@@ -165,7 +165,7 @@ def check_if_object_exist(object_name: str, resource_type: str, yaml_file_path:
             raise RuntimeError(f"Wrong enum {object_type}???")
     except Exception as e:
         if architecture == Architecture.ARM:
-            if "pymssql" in str(e) or "MySQLdb" in str(e):
+            if "MySQLdb" in str(e):
                 console.print(
                     f"[yellow]The imports fail on ARM: {object_name} in {resource_type} {e}, "
                     f"but it is expected.[/]"