You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2018/05/21 15:13:32 UTC
incubator-airflow git commit: [AIRFLOW-2429] Fix api, bin,
config_templates folders flake8 error
Repository: incubator-airflow
Updated Branches:
refs/heads/master dc78b9196 -> da1f64cf8
[AIRFLOW-2429] Fix api, bin, config_templates folders flake8 error
Closes #3391 from feng-tao/flake8_p2
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/da1f64cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/da1f64cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/da1f64cf
Branch: refs/heads/master
Commit: da1f64cf805abaecda227fc8c43a15a92faff648
Parents: dc78b91
Author: Tao feng <tf...@lyft.com>
Authored: Mon May 21 16:13:23 2018 +0100
Committer: Kaxil Naik <ka...@apache.org>
Committed: Mon May 21 16:13:23 2018 +0100
----------------------------------------------------------------------
airflow/api/__init__.py | 5 +-
airflow/api/auth/__init__.py | 4 +-
airflow/api/auth/backend/__init__.py | 4 +-
airflow/api/auth/backend/default.py | 4 +-
airflow/api/auth/backend/deny_all.py | 4 +-
airflow/api/auth/backend/kerberos_auth.py | 39 +++++------
airflow/api/client/__init__.py | 5 +-
airflow/api/client/api_client.py | 5 +-
airflow/api/client/json_client.py | 4 +-
airflow/api/client/local_client.py | 4 +-
airflow/api/common/__init__.py | 4 +-
airflow/api/common/experimental/__init__.py | 4 +-
airflow/api/common/experimental/delete_dag.py | 4 +-
airflow/api/common/experimental/get_task.py | 4 +-
.../common/experimental/get_task_instance.py | 4 +-
airflow/api/common/experimental/mark_tasks.py | 6 +-
airflow/api/common/experimental/pool.py | 4 +-
airflow/bin/__init__.py | 5 +-
airflow/bin/cli.py | 73 +++++++++++++-------
airflow/config_templates/__init__.py | 4 +-
.../config_templates/airflow_local_settings.py | 4 +-
airflow/config_templates/default_celery.py | 4 +-
airflow/config_templates/default_test.cfg | 6 +-
.../default_webserver_config.py | 6 +-
24 files changed, 116 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/__init__.py b/airflow/api/__init__.py
index 6f4de50..b4a2f8f 100644
--- a/airflow/api/__init__.py
+++ b/airflow/api/__init__.py
@@ -7,15 +7,16 @@
# 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.
+
from __future__ import print_function
from airflow.exceptions import AirflowException
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/auth/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/auth/__init__.py b/airflow/api/auth/__init__.py
index 4067cc7..114d189 100644
--- a/airflow/api/auth/__init__.py
+++ b/airflow/api/auth/__init__.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/auth/backend/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/auth/backend/__init__.py b/airflow/api/auth/backend/__init__.py
index 4067cc7..114d189 100644
--- a/airflow/api/auth/backend/__init__.py
+++ b/airflow/api/auth/backend/__init__.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/auth/backend/default.py
----------------------------------------------------------------------
diff --git a/airflow/api/auth/backend/default.py b/airflow/api/auth/backend/default.py
index e1f69dd..c3f4d8b 100644
--- a/airflow/api/auth/backend/default.py
+++ b/airflow/api/auth/backend/default.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/auth/backend/deny_all.py
----------------------------------------------------------------------
diff --git a/airflow/api/auth/backend/deny_all.py b/airflow/api/auth/backend/deny_all.py
index 10014b8..a38532d 100644
--- a/airflow/api/auth/backend/deny_all.py
+++ b/airflow/api/auth/backend/deny_all.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/auth/backend/kerberos_auth.py
----------------------------------------------------------------------
diff --git a/airflow/api/auth/backend/kerberos_auth.py b/airflow/api/auth/backend/kerberos_auth.py
index a904d59..7e560fb 100644
--- a/airflow/api/auth/backend/kerberos_auth.py
+++ b/airflow/api/auth/backend/kerberos_auth.py
@@ -1,33 +1,26 @@
-# Copyright (c) 2013, Michael Komitee
-# All rights reserved.
+# -*- coding: utf-8 -*-
#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
+# 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
#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 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.
from future.standard_library import install_aliases
from airflow.utils.log.logging_mixin import LoggingMixin
-install_aliases()
-
import kerberos
import os
@@ -43,6 +36,8 @@ from functools import wraps
from requests_kerberos import HTTPKerberosAuth
from socket import getfqdn
+install_aliases()
+
client_auth = HTTPKerberosAuth(service='airflow')
_SERVICE_NAME = None
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/client/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/client/__init__.py b/airflow/api/client/__init__.py
index f0f8b68..114d189 100644
--- a/airflow/api/client/__init__.py
+++ b/airflow/api/client/__init__.py
@@ -7,13 +7,12 @@
# 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.
-
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/client/api_client.py
----------------------------------------------------------------------
diff --git a/airflow/api/client/api_client.py b/airflow/api/client/api_client.py
index 12c251e..7a7d13c 100644
--- a/airflow/api/client/api_client.py
+++ b/airflow/api/client/api_client.py
@@ -7,16 +7,15 @@
# 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.
-#
class Client(object):
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/client/json_client.py
----------------------------------------------------------------------
diff --git a/airflow/api/client/json_client.py b/airflow/api/client/json_client.py
index 96fee76..e05913e 100644
--- a/airflow/api/client/json_client.py
+++ b/airflow/api/client/json_client.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/client/local_client.py
----------------------------------------------------------------------
diff --git a/airflow/api/client/local_client.py b/airflow/api/client/local_client.py
index ef31910..4b46921 100644
--- a/airflow/api/client/local_client.py
+++ b/airflow/api/client/local_client.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/__init__.py b/airflow/api/common/__init__.py
index 4067cc7..114d189 100644
--- a/airflow/api/common/__init__.py
+++ b/airflow/api/common/__init__.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/__init__.py b/airflow/api/common/experimental/__init__.py
index 4067cc7..114d189 100644
--- a/airflow/api/common/experimental/__init__.py
+++ b/airflow/api/common/experimental/__init__.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/delete_dag.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/delete_dag.py b/airflow/api/common/experimental/delete_dag.py
index f8b184c..a37ac96 100644
--- a/airflow/api/common/experimental/delete_dag.py
+++ b/airflow/api/common/experimental/delete_dag.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/get_task.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/get_task.py b/airflow/api/common/experimental/get_task.py
index 8f96fdc..472441d 100644
--- a/airflow/api/common/experimental/get_task.py
+++ b/airflow/api/common/experimental/get_task.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/get_task_instance.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/get_task_instance.py b/airflow/api/common/experimental/get_task_instance.py
index eccd3a9..cada270 100644
--- a/airflow/api/common/experimental/get_task_instance.py
+++ b/airflow/api/common/experimental/get_task_instance.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/mark_tasks.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/mark_tasks.py b/airflow/api/common/experimental/mark_tasks.py
index 74db1b4..e9e4fec 100644
--- a/airflow/api/common/experimental/mark_tasks.py
+++ b/airflow/api/common/experimental/mark_tasks.py
@@ -7,9 +7,9 @@
# 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
@@ -157,7 +157,7 @@ def set_state(task, execution_date, upstream=False, downstream=False,
# get all tasks of the main dag that will be affected by a state change
qry_dag = session.query(TI).filter(
- TI.dag_id==dag.dag_id,
+ TI.dag_id == dag.dag_id,
TI.execution_date.in_(confirmed_dates),
TI.task_id.in_(task_ids)).filter(
or_(TI.state.is_(None),
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/api/common/experimental/pool.py
----------------------------------------------------------------------
diff --git a/airflow/api/common/experimental/pool.py b/airflow/api/common/experimental/pool.py
index 7fb7586..57a6d97 100644
--- a/airflow/api/common/experimental/pool.py
+++ b/airflow/api/common/experimental/pool.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/bin/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/bin/__init__.py b/airflow/bin/__init__.py
index f0f8b68..114d189 100644
--- a/airflow/bin/__init__.py
+++ b/airflow/bin/__init__.py
@@ -7,13 +7,12 @@
# 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.
-
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/bin/cli.py
----------------------------------------------------------------------
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index 931849c..61d83a8 100644
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -29,11 +29,7 @@ import random
import string
from importlib import import_module
-import daemon
-import psutil
-import re
import getpass
-from urllib.parse import urlunparse
import reprlib
import argparse
from builtins import input
@@ -120,13 +116,17 @@ def setup_logging(filename):
def setup_locations(process, pid=None, stdout=None, stderr=None, log=None):
if not stderr:
- stderr = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME), "airflow-{}.err".format(process))
+ stderr = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME),
+ 'airflow-{}.err'.format(process))
if not stdout:
- stdout = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME), "airflow-{}.out".format(process))
+ stdout = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME),
+ 'airflow-{}.out'.format(process))
if not log:
- log = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME), "airflow-{}.log".format(process))
+ log = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME),
+ 'airflow-{}.log'.format(process))
if not pid:
- pid = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME), "airflow-{}.pid".format(process))
+ pid = os.path.join(os.path.expanduser(settings.AIRFLOW_HOME),
+ 'airflow-{}.pid'.format(process))
return pid, stdout, stderr, log
@@ -491,7 +491,8 @@ def task_failed_deps(args):
>>> airflow task_failed_deps tutorial sleep 2015-01-01
Task instance dependencies not met:
Dagrun Running: Task instance's dagrun did not exist: Unknown reason
- Trigger Rule: Task's trigger rule 'all_success' requires all upstream tasks to have succeeded, but found 1 non-success(es).
+ Trigger Rule: Task's trigger rule 'all_success' requires all upstream tasks
+ to have succeeded, but found 1 non-success(es).
"""
dag = get_dag(args)
task = dag.get_task(task_id=args.task_id)
@@ -880,7 +881,11 @@ def scheduler(args):
do_pickle=args.do_pickle)
if args.daemon:
- pid, stdout, stderr, log_file = setup_locations("scheduler", args.pid, args.stdout, args.stderr, args.log_file)
+ pid, stdout, stderr, log_file = setup_locations("scheduler",
+ args.pid,
+ args.stdout,
+ args.stderr,
+ args.log_file)
handle = setup_logging(log_file)
stdout = open(stdout, 'w+')
stderr = open(stderr, 'w+')
@@ -943,7 +948,11 @@ def worker(args):
}
if args.daemon:
- pid, stdout, stderr, log_file = setup_locations("worker", args.pid, args.stdout, args.stderr, args.log_file)
+ pid, stdout, stderr, log_file = setup_locations("worker",
+ args.pid,
+ args.stdout,
+ args.stderr,
+ args.log_file)
handle = setup_logging(log_file)
stdout = open(stdout, 'w+')
stderr = open(stderr, 'w+')
@@ -980,9 +989,9 @@ def initdb(args): # noqa
@cli_utils.action_logging
def resetdb(args):
print("DB: " + repr(settings.engine.url))
- if args.yes or input(
- "This will drop existing tables if they exist. "
- "Proceed? (y/n)").upper() == "Y":
+ if args.yes or input("This will drop existing tables "
+ "if they exist. Proceed? "
+ "(y/n)").upper() == "Y":
db_utils.resetdb(settings.RBAC)
else:
print("Bail.")
@@ -999,7 +1008,7 @@ def upgradedb(args): # noqa
if not ds_rows:
qry = (
session.query(DagRun.dag_id, DagRun.state, func.count('*'))
- .group_by(DagRun.dag_id, DagRun.state)
+ .group_by(DagRun.dag_id, DagRun.state)
)
for dag_id, state, count in qry:
session.add(DagStat(dag_id=dag_id, state=state, count=count))
@@ -1116,20 +1125,31 @@ def connections(args):
if args.conn_uri:
new_conn = Connection(conn_id=args.conn_id, uri=args.conn_uri)
else:
- new_conn = Connection(conn_id=args.conn_id, conn_type=args.conn_type, host=args.conn_host,
- login=args.conn_login, password=args.conn_password, schema=args.conn_schema, port=args.conn_port)
+ new_conn = Connection(conn_id=args.conn_id,
+ conn_type=args.conn_type,
+ host=args.conn_host,
+ login=args.conn_login,
+ password=args.conn_password,
+ schema=args.conn_schema,
+ port=args.conn_port)
if args.conn_extra is not None:
new_conn.set_extra(args.conn_extra)
session = settings.Session()
- if not (session
- .query(Connection)
- .filter(Connection.conn_id == new_conn.conn_id).first()):
+ if not (session.query(Connection)
+ .filter(Connection.conn_id == new_conn.conn_id).first()):
session.add(new_conn)
session.commit()
msg = '\n\tSuccessfully added `conn_id`={conn_id} : {uri}\n'
- msg = msg.format(conn_id=new_conn.conn_id, uri=args.conn_uri or urlunparse((args.conn_type, '{login}:{password}@{host}:{port}'.format(
- login=args.conn_login or '', password=args.conn_password or '', host=args.conn_host or '', port=args.conn_port or ''), args.conn_schema or '', '', '', '')))
+ msg = msg.format(conn_id=new_conn.conn_id,
+ uri=args.conn_uri or
+ urlunparse((args.conn_type,
+ '{login}:{password}@{host}:{port}'
+ .format(login=args.conn_login or '',
+ password=args.conn_password or '',
+ host=args.conn_host or '',
+ port=args.conn_port or ''),
+ args.conn_schema or '', '', '', '')))
print(msg)
else:
msg = '\n\tA connection with `conn_id`={conn_id} already exists\n'
@@ -1157,7 +1177,11 @@ def flower(args):
flower_conf = '--conf=' + args.flower_conf
if args.daemon:
- pid, stdout, stderr, log_file = setup_locations("flower", args.pid, args.stdout, args.stderr, args.log_file)
+ pid, stdout, stderr, log_file = setup_locations("flower",
+ args.pid,
+ args.stdout,
+ args.stderr,
+ args.log_file)
stdout = open(stdout, 'w+')
stderr = open(stderr, 'w+')
@@ -1684,7 +1708,8 @@ class CLIFactory(object):
}, {
'func': variables,
'help': "CRUD operations on variables",
- "args": ('set', 'get', 'json', 'default', 'var_import', 'var_export', 'var_delete'),
+ "args": ('set', 'get', 'json', 'default',
+ 'var_import', 'var_export', 'var_delete'),
}, {
'func': kerberos,
'help': "Start a kerberos ticket renewer",
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/config_templates/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/config_templates/__init__.py b/airflow/config_templates/__init__.py
index 4067cc7..114d189 100644
--- a/airflow/config_templates/__init__.py
+++ b/airflow/config_templates/__init__.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/config_templates/airflow_local_settings.py
----------------------------------------------------------------------
diff --git a/airflow/config_templates/airflow_local_settings.py b/airflow/config_templates/airflow_local_settings.py
index 886e179..c461ece 100644
--- a/airflow/config_templates/airflow_local_settings.py
+++ b/airflow/config_templates/airflow_local_settings.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/config_templates/default_celery.py
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_celery.py b/airflow/config_templates/default_celery.py
index 728e4c5..9a5bdf8 100644
--- a/airflow/config_templates/default_celery.py
+++ b/airflow/config_templates/default_celery.py
@@ -7,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/config_templates/default_test.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_test.cfg b/airflow/config_templates/default_test.cfg
index 7360619..26851ef 100644
--- a/airflow/config_templates/default_test.cfg
+++ b/airflow/config_templates/default_test.cfg
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
# 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
@@ -5,9 +7,9 @@
# 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/da1f64cf/airflow/config_templates/default_webserver_config.py
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_webserver_config.py b/airflow/config_templates/default_webserver_config.py
index de6f5c7..ba33d81 100644
--- a/airflow/config_templates/default_webserver_config.py
+++ b/airflow/config_templates/default_webserver_config.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
# 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
@@ -5,9 +7,9 @@
# 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