This is an automated email from the ASF dual-hosted git repository.
xddeng pushed a commit to branch v1-10-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v1-10-stable by this push:
new dbf2e30 Handle possible suffix in MySQL version + avoid hard-coding
(#14274)
dbf2e30 is described below
commit dbf2e302313580b6eaa85e9fcbcace8b6260c85a
Author: Xiaodong DENG <[email protected]>
AuthorDate: Thu Feb 18 19:44:59 2021 +0100
Handle possible suffix in MySQL version + avoid hard-coding (#14274)
closes #14262, and do additional minor improvement
---
.../rules/postgres_mysql_sqlite_version_upgrade_check.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/airflow/upgrade/rules/postgres_mysql_sqlite_version_upgrade_check.py
b/airflow/upgrade/rules/postgres_mysql_sqlite_version_upgrade_check.py
index 272f741..6020665 100644
--- a/airflow/upgrade/rules/postgres_mysql_sqlite_version_upgrade_check.py
+++ b/airflow/upgrade/rules/postgres_mysql_sqlite_version_upgrade_check.py
@@ -43,16 +43,23 @@ SQLite - 3.15+
min_req_sqlite_version = Version('3.15')
installed_sqlite_version = Version(session.execute('select
sqlite_version();').scalar())
if installed_sqlite_version < min_req_sqlite_version:
- return "From Airflow 2.0, SQLite version below 3.15 is no
longer supported. \n" + more_info
+ return "From Airflow 2.0, SQLite version below {} is no longer
supported. \n{}".format(
+ min_req_sqlite_version, more_info
+ )
elif "postgres" in conn_str:
min_req_postgres_version = Version('9.6')
installed_postgres_version = Version(session.execute('SHOW
server_version;').scalar())
if installed_postgres_version < min_req_postgres_version:
- return "From Airflow 2.0, PostgreSQL version below 9.6 is no
longer supported. \n" + more_info
+ return "From Airflow 2.0, PostgreSQL version below {} is no
longer supported. \n{}".format(
+ min_req_postgres_version, more_info
+ )
elif "mysql" in conn_str:
min_req_mysql_version = Version('5.7')
- installed_mysql_version = Version(session.execute('SELECT
VERSION();').scalar())
+ # special treatment is needed here, because MySQL version may
include a suffix like '-log'
+ installed_mysql_version = Version(session.execute('SELECT
VERSION();').scalar().split('-')[0])
if installed_mysql_version < min_req_mysql_version:
- return "From Airflow 2.0, MySQL version below 5.7 is no longer
supported. \n" + more_info
+ return "From Airflow 2.0, MySQL version below {} is no longer
supported. \n{}".format(
+ min_req_mysql_version, more_info
+ )
