Re-enable pymsql on ARM as it now builds cleanly (apache#28530)

Jorricks · Dec 22, 2022 · 78238d5 · 78238d5
1 parent 884fca8
commit 78238d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.[/]"