Skip to content

Commit

Permalink
Re-enable pymsql on ARM as it now builds cleanly (#28530)
Browse files Browse the repository at this point in the history
(cherry picked from commit 78238d5)
  • Loading branch information
Taragolis authored and ephraimbuddy committed Jan 12, 2023
1 parent 5eb90ef commit f59105e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion airflow/providers/microsoft/mssql/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion generated/provider_dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/in_container/run_provider_yaml_files_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.[/]"
Expand Down

0 comments on commit f59105e

Please sign in to comment.