forked from apache/airflow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add ODBC extra for the production image (apache#18407)
The ODBC extra has been missing from apache#18382. This PR adds the missing extra and verifies if pyodbc is importable in the PROD image.
- Loading branch information
Showing
8 changed files
with
160 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
scripts/ci/pre_commit/pre_commit_check_order_dockerfile_extras.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| #!/usr/bin/env python | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| """ | ||
| Test for an order of dependencies in setup.py | ||
| """ | ||
| import os | ||
| import sys | ||
| from typing import List | ||
|
|
||
| from rich import print | ||
|
|
||
| errors = [] | ||
|
|
||
| MY_DIR_PATH = os.path.dirname(__file__) | ||
| SOURCE_DIR_PATH = os.path.abspath(os.path.join(MY_DIR_PATH, os.pardir, os.pardir, os.pardir)) | ||
| BUILD_ARGS_REF_PATH = os.path.join(SOURCE_DIR_PATH, "docs", "docker-stack", "build-arg-ref.rst") | ||
|
|
||
| START_LINE = ".. BEGINNING OF EXTRAS LIST UPDATED BY PRE COMMIT" | ||
| END_LINE = ".. END OF EXTRAS LIST UPDATED BY PRE COMMIT" | ||
|
|
||
|
|
||
| def _check_list_sorted(the_list: List[str], message: str) -> bool: | ||
| print(the_list) | ||
| sorted_list = sorted(the_list) | ||
| if the_list == sorted_list: | ||
| print(f"{message} is [green]ok[/]") | ||
| print() | ||
| return True | ||
| i = 0 | ||
| while sorted_list[i] == the_list[i]: | ||
| i += 1 | ||
| print(f"{message} [red]NOK[/]") | ||
| print() | ||
| errors.append( | ||
| f"ERROR in {message}. First wrongly sorted element {repr(the_list[i])}. Should " | ||
| f"be {repr(sorted_list[i])}" | ||
| ) | ||
| return False | ||
|
|
||
|
|
||
| def check_dockerfile(): | ||
| with open(os.path.join(SOURCE_DIR_PATH, "Dockerfile")) as dockerfile: | ||
| file_contents = dockerfile.read() | ||
| for line in file_contents.splitlines(): | ||
| if line.startswith("ARG AIRFLOW_EXTRAS="): | ||
| extras_list = line.split("=")[1].replace('"', '').split(",") | ||
| if _check_list_sorted(extras_list, "Dockerfile's AIRFLOW_EXTRAS"): | ||
| with open(BUILD_ARGS_REF_PATH) as build_args_file: | ||
| content = build_args_file.read().splitlines(keepends=False) | ||
| result = [] | ||
| is_copying = True | ||
| for line in content: | ||
| if line.startswith(START_LINE): | ||
| result.append(line) | ||
| is_copying = False | ||
| for extra in extras_list: | ||
| result.append(f'* {extra}') | ||
| elif line.startswith(END_LINE): | ||
| result.append(line) | ||
| is_copying = True | ||
| elif is_copying: | ||
| result.append(line) | ||
| with open(BUILD_ARGS_REF_PATH, "w") as build_args_file: | ||
| build_args_file.write("\n".join(result)) | ||
| build_args_file.write("\n") | ||
| return | ||
| errors.append("Something is wrong. Dockerfile does not contain AIRFLOW_EXTRAS") | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| check_dockerfile() | ||
| print() | ||
| print() | ||
| for error in errors: | ||
| print(error) | ||
|
|
||
| print() | ||
|
|
||
| if errors: | ||
| sys.exit(1) |