You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2021/04/15 15:04:41 UTC
[airflow] branch v2-0-test updated (79ff590 -> 39593f9)
This is an automated email from the ASF dual-hosted git repository.
ash pushed a change to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.
from 79ff590 Don't import mysql exceptions from "private" module (#15039)
new 1366d65 Remove unused JS packages (#15383)
new 39593f9 Fix "leaking" log driver in tests
The 2 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:
airflow/www/package.json | 2 --
airflow/www/yarn.lock | 10 +++++++++-
tests/cli/commands/test_info_command.py | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
[airflow] 02/02: Fix "leaking" log driver in tests
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 39593f958075471792560a1d1c04536a795c1316
Author: Ash Berlin-Taylor <as...@apache.org>
AuthorDate: Thu Apr 15 15:58:34 2021 +0100
Fix "leaking" log driver in tests
There is some problem where the stackdriver logging "leaks" out of this
test and remains configured, (where as the S3 one doesn't) but given
this test is not actually testing logs, a quick, fix is just to change
with remote logging handler we use.
---
tests/cli/commands/test_info_command.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/cli/commands/test_info_command.py b/tests/cli/commands/test_info_command.py
index 7fad6e8..e169c5c 100644
--- a/tests/cli/commands/test_info_command.py
+++ b/tests/cli/commands/test_info_command.py
@@ -119,14 +119,14 @@ class TestConfigInfoLogging(unittest.TestCase):
with conf_vars(
{
('logging', 'remote_logging'): 'True',
- ('logging', 'remote_base_log_folder'): 'stackdriver://logs-name',
+ ('logging', 'remote_base_log_folder'): 's3://logs-name',
}
):
importlib.reload(airflow_local_settings)
configure_logging()
instance = info_command.ConfigInfo(info_command.NullAnonymizer())
text = capture_show_output(instance)
- assert "stackdriver" in text
+ assert "S3TaskHandler" in text
def tearDown(self) -> None:
importlib.reload(airflow_local_settings)
[airflow] 01/02: Remove unused JS packages (#15383)
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 1366d651c50857f20f35f32e40491768a7b1b9c2
Author: Ryan Hamilton <ry...@ryanahamilton.com>
AuthorDate: Thu Apr 15 10:34:20 2021 -0400
Remove unused JS packages (#15383)
(cherry picked from commit f69bb8255d2ed60be275d1466255c874aef600f0)
---
airflow/www/package.json | 2 --
airflow/www/yarn.lock | 10 +++++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/airflow/www/package.json b/airflow/www/package.json
index 57a7b1d..730f142 100644
--- a/airflow/www/package.json
+++ b/airflow/www/package.json
@@ -68,8 +68,6 @@
"datatables.net-bs": "^1.10.23",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"jquery": ">=3.4.0",
- "js-yaml": "^3.14.0",
- "lodash": "^4.17.20",
"moment-timezone": "^0.5.28",
"nvd3": "^1.8.6",
"redoc": "^2.0.0-rc.48",
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
index 7e56643..9573141 100644
--- a/airflow/www/yarn.lock
+++ b/airflow/www/yarn.lock
@@ -4142,7 +4142,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-js-yaml@^3.12.1, js-yaml@^3.13.1, js-yaml@^3.14.0:
+js-yaml@^3.12.1, js-yaml@^3.13.1:
version "3.14.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -4150,6 +4150,14 @@ js-yaml@^3.12.1, js-yaml@^3.13.1, js-yaml@^3.14.0:
argparse "^1.0.7"
esprima "^4.0.0"
+js-yaml@^3.14.0:
+ version "3.14.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+ integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
jsesc@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"