Remove airflow.bin package (#7808)

Dockerfile

@@ -366,7 +366,6 @@ COPY setup.cfg ${AIRFLOW_SOURCES}/setup.cfg
 
 COPY airflow/version.py ${AIRFLOW_SOURCES}/airflow/version.py
 COPY airflow/__init__.py ${AIRFLOW_SOURCES}/airflow/__init__.py
-COPY airflow/bin/airflow ${AIRFLOW_SOURCES}/airflow/bin/airflow
 
 COPY requirements.txt ${AIRFLOW_SOURCES}/requirements.txt
 

airflow/bin/airflow → airflow/__main__.py

@@ -17,22 +17,28 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
 """Main executable module"""
 
 import os
 
 import argcomplete
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.configuration import conf
 
-if __name__ == '__main__':
 
+def main():
+    """Main executable function"""
     if conf.get("core", "security") == 'kerberos':
         os.environ['KRB5CCNAME'] = conf.get('kerberos', 'ccache')
         os.environ['KRB5_KTNAME'] = conf.get('kerberos', 'keytab')
 
-    parser = cli.get_parser()
+    parser = cli_parser.get_parser()
     argcomplete.autocomplete(parser)
     args = parser.parse_args()
     args.func(args)
+
+
+if __name__ == '__main__':
+    main()

airflow/bin/cli.py → airflow/cli/cli_parser.py

@@ -27,16 +27,14 @@
 
 from tabulate import tabulate_formats
 
-from airflow import api, settings
+from airflow import settings
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.executors.executor_loader import ExecutorLoader
 from airflow.utils.helpers import partition
 from airflow.utils.module_loading import import_string
 from airflow.utils.timezone import parse as parsedate
 
-api.load_auth()
-
 DAGS_FOLDER = settings.DAGS_FOLDER
 
 BUILD_DOCS = "BUILDING_AIRFLOW_DOCS" in os.environ
@@ -1150,7 +1148,7 @@ class DefaultHelpParser(argparse.ArgumentParser):
         def error(self, message):
             self.print_help()
             self.exit(2, '\n{} command error: {}, see help above.\n'.format(self.prog, message))
-    parser = DefaultHelpParser()
+    parser = DefaultHelpParser(prog="airflow")
     subparsers = parser.add_subparsers(
         help='sub-command help', dest='subcommand')
     subparsers.required = True

airflow/models/dag.py

@@ -1407,8 +1407,8 @@ def cli(self):
         """
         Exposes a CLI specific to this DAG
         """
-        from airflow.bin import cli
-        parser = cli.get_parser(dag_parser=True)
+        from airflow.cli import cli_parser
+        parser = cli_parser.get_parser(dag_parser=True)
         args = parser.parse_args()
         args.func(args, self)
 

airflow/settings.py

@@ -31,6 +31,7 @@
 from sqlalchemy.pool import NullPool
 
 # noinspection PyUnresolvedReferences
+from airflow import api
 from airflow.configuration import AIRFLOW_HOME, WEBSERVER_CONFIG, conf  # NOQA F401
 from airflow.logging_config import configure_logging
 from airflow.utils.module_loading import import_string
@@ -304,6 +305,7 @@ def initialize():
     # The webservers import this file from models.py with the default settings.
     configure_orm()
     configure_action_logging()
+    api.load_auth()
 
     # Ensure we close DB connections at scheduler and gunicon worker terminations
     atexit.register(dispose_orm)

airflow/task/task_runner/standard_task_runner.py

@@ -53,7 +53,7 @@ def _start_by_fork(self):  # pylint: disable=inconsistent-return-statements
             self.log.info("Started process %d to run task", pid)
             return psutil.Process(pid)
         else:
-            from airflow.bin.cli import get_parser
+            from airflow.cli.cli_parser import get_parser
             import signal
             import airflow.settings as settings
 

docs/cli-ref.rst

@@ -32,6 +32,6 @@ development and testing.
     :depth: 2
 
 .. argparse::
-   :module: airflow.bin.cli
+   :module: airflow.cli.cli_parser
    :func: get_parser
    :prog: airflow

setup.py

@@ -654,7 +654,11 @@ def do_setup(pinned=False):
         },
         include_package_data=True,
         zip_safe=False,
-        scripts=['airflow/bin/airflow'],
+        entry_points={
+            "console_scripts": [
+                "airflow = airflow.__main__:main",
+            ],
+        },
         install_requires=get_install_requires(pinned=pinned),
         setup_requires=[
             'bowler',

tests/cli/commands/test_celery_command.py

@@ -25,7 +25,7 @@
 import sqlalchemy
 
 import airflow
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import celery_command
 from airflow.configuration import conf
 from tests.test_utils.config import conf_vars
@@ -71,11 +71,11 @@ class TestWorkerServeLogs(unittest.TestCase):
     @classmethod
     @conf_vars({("core", "executor"): "CeleryExecutor"})
     def setUpClass(cls):
-        importlib.reload(cli)
-        cls.parser = cli.get_parser()
+        importlib.reload(cli_parser)
+        cls.parser = cli_parser.get_parser()
 
     def tearDown(self):
-        importlib.reload(cli)
+        importlib.reload(cli_parser)
 
     @mock.patch('airflow.cli.commands.celery_command.worker_bin')
     def test_serve_logs_on_worker_start(self, mock_worker):
@@ -102,11 +102,11 @@ class TestCeleryStopCommand(unittest.TestCase):
     @classmethod
     @conf_vars({("core", "executor"): "CeleryExecutor"})
     def setUpClass(cls):
-        importlib.reload(cli)
-        cls.parser = cli.get_parser()
+        importlib.reload(cli_parser)
+        cls.parser = cli_parser.get_parser()
 
     def tearDown(self):
-        importlib.reload(cli)
+        importlib.reload(cli_parser)
 
     @mock.patch("airflow.cli.commands.celery_command.setup_locations")
     @mock.patch("airflow.cli.commands.celery_command.psutil.Process")
@@ -158,11 +158,11 @@ class TestWorkerStart(unittest.TestCase):
     @classmethod
     @conf_vars({("core", "executor"): "CeleryExecutor"})
     def setUpClass(cls):
-        importlib.reload(cli)
-        cls.parser = cli.get_parser()
+        importlib.reload(cli_parser)
+        cls.parser = cli_parser.get_parser()
 
     def tearDown(self):
-        importlib.reload(cli)
+        importlib.reload(cli_parser)
 
     @mock.patch("airflow.cli.commands.celery_command.setup_locations")
     @mock.patch('airflow.cli.commands.celery_command.Process')

tests/cli/commands/test_config_command.py

@@ -19,15 +19,15 @@
 import unittest
 from unittest import mock
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import config_command
 from tests.test_utils.config import conf_vars
 
 
 class TestCliConfig(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     @mock.patch("airflow.cli.commands.config_command.io.StringIO")
     @mock.patch("airflow.cli.commands.config_command.conf")

tests/cli/commands/test_connection_command.py

@@ -21,7 +21,7 @@
 
 from parameterized import parameterized
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import connection_command
 from airflow.models import Connection
 from airflow.utils.db import merge_conn
@@ -47,7 +47,7 @@ class TestCliListConnections(unittest.TestCase):
     ]
 
     def setUp(self):
-        self.parser = cli.get_parser()
+        self.parser = cli_parser.get_parser()
         clear_db_connections()
 
     def tearDown(self):
@@ -80,7 +80,7 @@ def test_cli_connections_list_as_tsv(self):
 class TestCliAddConnections(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
         clear_db_connections()
 
     @classmethod
@@ -255,7 +255,7 @@ def test_cli_connections_add_delete_with_missing_parameters(self):
 class TestCliDeleteConnections(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
         clear_db_connections()
 
     @classmethod

tests/cli/commands/test_dag_command.py

@@ -26,8 +26,8 @@
 import mock
 import pytz
 
-import airflow.bin.cli as cli
 from airflow import settings
+from airflow.cli import cli_parser
 from airflow.cli.commands import dag_command
 from airflow.exceptions import AirflowException
 from airflow.models import DagBag, DagModel, DagRun
@@ -58,7 +58,7 @@ class TestCliDags(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     @mock.patch("airflow.cli.commands.dag_command.DAG.run")
     def test_backfill(self, mock_run):

tests/cli/commands/test_db_command.py

@@ -20,15 +20,15 @@
 
 from sqlalchemy.engine.url import make_url
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import db_command
 from airflow.exceptions import AirflowException
 
 
 class TestCliDb(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     @mock.patch("airflow.cli.commands.db_command.db.initdb")
     def test_cli_initdb(self, mock_initdb):

tests/cli/commands/test_pool_command.py

@@ -23,7 +23,7 @@
 from contextlib import redirect_stdout
 
 from airflow import models, settings
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import pool_command
 from airflow.models import Pool
 from airflow.settings import Session
@@ -34,7 +34,7 @@ class TestCliPools(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = models.DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     def setUp(self):
         super().setUp()

tests/cli/commands/test_role_command.py

@@ -21,7 +21,7 @@
 from contextlib import redirect_stdout
 
 from airflow import models
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import role_command
 from airflow.settings import Session
 
@@ -33,7 +33,7 @@ class TestCliRoles(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = models.DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     def setUp(self):
         from airflow.www import app as application

tests/cli/commands/test_sync_perm_command.py

@@ -19,7 +19,7 @@
 import unittest
 from unittest import mock
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import sync_perm_command
 from airflow.models.dag import DAG
 from airflow.models.dagbag import DagBag
@@ -30,7 +30,7 @@ class TestCliSyncPerm(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     def setUp(self):
         from airflow.www import app as application

tests/cli/commands/test_task_command.py

@@ -25,7 +25,7 @@
 from parameterized import parameterized
 from tabulate import tabulate
 
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import task_command
 from airflow.exceptions import AirflowException
 from airflow.models import DagBag, TaskInstance
@@ -50,7 +50,7 @@ class TestCliTasks(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     def test_cli_list_tasks(self):
         for dag_id in self.dagbag.dags:
@@ -251,7 +251,7 @@ def setUp(self):
         clear_db_runs()
         clear_db_pools()
 
-        self.parser = cli.get_parser()
+        self.parser = cli_parser.get_parser()
 
     def test_run_ignores_all_dependencies(self):
         """

tests/cli/commands/test_user_command.py

@@ -23,7 +23,7 @@
 from contextlib import redirect_stdout
 
 from airflow import models
-from airflow.bin import cli
+from airflow.cli import cli_parser
 from airflow.cli.commands import user_command
 from airflow.settings import Session
 
@@ -44,7 +44,7 @@ class TestCliUsers(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.dagbag = models.DagBag(include_examples=True)
-        cls.parser = cli.get_parser()
+        cls.parser = cli_parser.get_parser()
 
     def setUp(self):
         from airflow.www import app as application