You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by pi...@apache.org on 2023/01/12 00:12:10 UTC
[airflow] branch v2-5-test updated (df84c2d1d3 -> e420172865)
This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a change to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
from df84c2d1d3 Add Niko to committers (#28712)
new dbdafc5ab7 Bump json5 from 1.0.1 to 1.0.2 in /airflow/www (#28715)
new 9687cd7fdd Ignore Blackification commit from Blame (#28719)
new e420172865 Limit SQLAlchemy to below 2.0 (#28725)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.git-blame-ignore-revs | 1 +
airflow/www/yarn.lock | 13 ++++---------
scripts/in_container/verify_providers.py | 7 ++++---
setup.cfg | 6 +++++-
4 files changed, 14 insertions(+), 13 deletions(-)
[airflow] 02/03: Ignore Blackification commit from Blame (#28719)
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 9687cd7fdd58b5c5f0409230c7bd71acd00c9fea
Author: Tzu-ping Chung <ur...@gmail.com>
AuthorDate: Wed Jan 4 15:41:47 2023 +0800
Ignore Blackification commit from Blame (#28719)
(cherry picked from commit 8cb69bb05417075adebef19cd28b2409dbba3f33)
---
.git-blame-ignore-revs | 1 +
1 file changed, 1 insertion(+)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3cbfd2db16..639153b3c0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -8,3 +8,4 @@ d67ac5932dabbf06ae733fc57b48491a8029b8c2
# Mass converting string literals to use double quotes.
2a34dc9e8470285b0ed2db71109ef4265e29688b
bfcae349b88fd959e32bfacd027a5be976fe2132
+01a819a42daa7990c30ab9776208b3dcb9f3a28b
[airflow] 01/03: Bump json5 from 1.0.1 to 1.0.2 in /airflow/www (#28715)
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit dbdafc5ab790ada51928055cb183d1042ef74bde
Author: Dependabot [bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jan 4 09:32:52 2023 -0500
Bump json5 from 1.0.1 to 1.0.2 in /airflow/www (#28715)
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)
---
updated-dependencies:
- dependency-name: json5
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <su...@github.com>
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit e4bc5e54b1f41c991542850045bcfd060bac7395)
---
airflow/www/yarn.lock | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
index 5431b00d52..17125472c3 100644
--- a/airflow/www/yarn.lock
+++ b/airflow/www/yarn.lock
@@ -7235,9 +7235,9 @@ json-stringify-safe@^5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+ integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies:
minimist "^1.2.0"
@@ -7684,16 +7684,11 @@ minimist-options@4.1.0:
is-plain-obj "^1.1.0"
kind-of "^6.0.3"
-minimist@^1.2.0:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-minimist@^1.2.5, minimist@^1.2.6:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
- integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
minipass-collect@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
[airflow] 03/03: Limit SQLAlchemy to below 2.0 (#28725)
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e420172865a4568b328b0cbf6a9135d8c3b24205
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Jan 4 13:39:50 2023 +0100
Limit SQLAlchemy to below 2.0 (#28725)
SQLAlchemy is about to release 2.0 version and in 1.46 version it
started to warn about deprecated features that are used. This
(nicely) started to fail our builds - so our canary tests caught
it early and gave us a chance to prepare for the 2.0 release and
limit Airflow's dependencies beforehand.
This PR adds the deprecation as "known" and limits SQLAlchemy to
be <2.0 (and links to appropriate issues and documentation)
(cherry picked from commit 93fed0cf5eeed5dbea9f261370149206232fca98)
---
scripts/in_container/verify_providers.py | 7 ++++---
setup.cfg | 6 +++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/in_container/verify_providers.py b/scripts/in_container/verify_providers.py
index 87d79ee6ca..d46e32caa3 100755
--- a/scripts/in_container/verify_providers.py
+++ b/scripts/in_container/verify_providers.py
@@ -231,6 +231,7 @@ KNOWN_COMMON_DEPRECATED_MESSAGES: set[str] = {
"Please use `schedule` instead. ",
"'urllib3.contrib.pyopenssl' module is deprecated and will be removed in a future "
"release of urllib3 2.x. Read more in this issue: https://github.com/urllib3/urllib3/issues/2680",
+ "Deprecated API features detected! These feature(s) are not compatible with SQLAlchemy 2.0",
}
# The set of warning messages generated by direct importing of some deprecated modules. We should only
@@ -260,7 +261,7 @@ KNOWN_DEPRECATED_DIRECT_IMPORTS: set[str] = {
def filter_known_warnings(warn: warnings.WarningMessage) -> bool:
msg_string = str(warn.message).replace("\n", " ")
for message, origin in KNOWN_DEPRECATED_MESSAGES:
- if msg_string == message and warn.filename.find(f"/{origin}/") != -1:
+ if message in msg_string and warn.filename.find(f"/{origin}/") != -1:
return False
return True
@@ -268,7 +269,7 @@ def filter_known_warnings(warn: warnings.WarningMessage) -> bool:
def filter_direct_importlib_warning(warn: warnings.WarningMessage) -> bool:
msg_string = str(warn.message).replace("\n", " ")
for m in KNOWN_DEPRECATED_DIRECT_IMPORTS:
- if msg_string == m and warn.filename.find("/importlib/") != -1:
+ if m in msg_string and warn.filename.find("/importlib/") != -1:
return False
return True
@@ -276,7 +277,7 @@ def filter_direct_importlib_warning(warn: warnings.WarningMessage) -> bool:
def filter_known_common_deprecated_messages(warn: warnings.WarningMessage) -> bool:
msg_string = str(warn.message).replace("\n", " ")
for m in KNOWN_COMMON_DEPRECATED_MESSAGES:
- if msg_string == m:
+ if m in msg_string:
return False
return True
diff --git a/setup.cfg b/setup.cfg
index 5cc2a1342b..868065c398 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -125,7 +125,11 @@ install_requires =
python-slugify>=5.0
rich>=12.4.4
setproctitle>=1.1.8
- sqlalchemy>=1.4
+ # We use some deprecated features of sqlalchemy 2.0 and we should replace them before we can upgrade
+ # See https://sqlalche.me/e/b8d9 for details of deprecated features
+ # you can set environment variable SQLALCHEMY_WARN_20=1 to show all deprecation warnings.
+ # The issue tracking it is https://github.com/apache/airflow/issues/28723
+ sqlalchemy>=1.4,<2.0
sqlalchemy_jsonfield>=1.0
tabulate>=0.7.5
tenacity>=6.2.0