Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix backwards-compatibility introduced by fixing mypy problems #24230

Merged
merged 1 commit into from
Jun 5, 2022
Merged

Fix backwards-compatibility introduced by fixing mypy problems #24230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion airflow/providers/apache/spark/hooks/spark_submit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,10 @@ def on_kill(self) -> None:
# we still attempt to kill the yarn application
renew_from_kt(self._principal, self._keytab, exit_on_fail=False)
env = os.environ.copy()
env["KRB5CCNAME"] = airflow_conf.get_mandatory_value('kerberos', 'ccache')
ccacche = airflow_conf.get('kerberos', 'ccache')
if ccacche is None:
raise ValueError("The kerberos/ccache config should be set here!")
env["KRB5CCNAME"] = ccacche

with subprocess.Popen(
kill_cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE
Expand Down
5 changes: 4 additions & 1 deletion airflow/providers/qubole/hooks/qubole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,10 @@ def get_results(
"""
if fp is None:
iso = datetime.datetime.utcnow().isoformat()
logpath = os.path.expanduser(conf.get_mandatory_value('logging', 'BASE_LOG_FOLDER'))
base_log_folder = conf.get('logging', 'BASE_LOG_FOLDER')
if base_log_folder is None:
raise ValueError("logging/BASE_LOG_FOLDER config value should be set")
logpath = os.path.expanduser(base_log_folder)
resultpath = logpath + '/' + self.dag_id + '/' + self.task_id + '/results'
pathlib.Path(resultpath).mkdir(parents=True, exist_ok=True)
fp = open(resultpath + '/' + iso, 'wb')
Expand Down
10 changes: 10 additions & 0 deletions scripts/ci/pre_commit/pre_commit_check_2_1_compatibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
GET_ATTR_MATCHER = re.compile(r".*getattr\((ti|TI), ['\"]run_id['\"]\).*")
TI_RUN_ID_MATCHER = re.compile(r".*(ti|TI)\.run_id.*")
TRY_NUM_MATCHER = re.compile(r".*context.*\[[\"']try_number[\"']].*")
GET_MANDATORY_MATCHER = re.compile(r".*conf\.get_mandatory_value")


def _check_file(_file: Path):
Expand Down Expand Up @@ -91,6 +92,15 @@ def _check_file(_file: Path):
f"as it is not available in Airflow 2.2[/]"
)

if GET_MANDATORY_MATCHER.match(line):
errors.append(
f"[red]In {_file}:{index} there is a forbidden construct "
f"(Airflow 2.3+ only):[/]\n\n"
f"{lines[index]}\n\n"
f"[yellow]You should not use conf.get_mandatory_value "
f"as it is not available in Airflow 2.2[/]"
Comment on lines +100 to +101
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the next provider release should set all providers to Airflow 2.2 as min version?
https://github.com/apache/airflow#support-for-providers

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. But this change is only available in 2.3 :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There will be a separate change about bumping min version to 2.2 after this one.

)


if __name__ == '__main__':
for file in sys.argv[1:]:
Expand Down