diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 26bc697d75f0a..d371873ad7da7 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -20,15 +20,7 @@ labelPRBasedOnFilePath: provider:GCP: - - airflow/**/gcp/* - - airflow/gcp/* - - airflow/gcp/**/* - airflow/providers/google/cloud/**/* - - airflow/**/gcp_*.py - - airflow/**/gcs_*.py - - airflow/**/bigquery_*.py - - tests/gcp/**/* - - tests/gcp/* - tests/providers/google/cloud/**/* - tests/providers/google/cloud/* - docs/howto/connection/gcp.rst @@ -36,30 +28,16 @@ labelPRBasedOnFilePath: - docs/howto/operator/gcp/* provider:AWS: - - airflow/**/aws/* - airflow/providers/amazon/aws/**/* - - airflow/**/aws_*.py - - airflow/**/ecs_*.py - - airflow/**/emr_*.py - - airflow/**/s3_*.py - - airflow/**/sagemaker_*.py - tests/providers/amazon/aws/**/* - tests/providers/amazon/aws/* - - tests/**/aws_*.py - - tests/**/s3_*.py - - tests/**/ecs_*.py - - tests/**/emr_*.py - docs/howto/connection/aws.rst - docs/howto/operator/amazon/aws/* provider:Azure: - - airflow/**/azure/* - - airflow/**/azure_*.py - - airflow/**/adls_*.py - - airflow/**/wasb_*.py - - tests/**/wasb_*.py - - tests/**/adls_*.py - - tests/**/azure_*.py + - airflow/providers/microsoft/azure/**/* + - tests/providers/microsoft/azure/**/* + - tests/providers/microsoft/azure/* provider:Apache: - airflow/providers/apache/**/* @@ -69,7 +47,7 @@ labelPRBasedOnFilePath: k8s: - airflow/**/kubernetes_*.py - airflow/kubernetes/**/* - - tests/integration/kubernetes/* + - tests/runtime/kubernetes/* - docs/kubernetes.rst area:dev: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 52bc2ff682983..d6c0c9fc57670 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -259,6 +259,13 @@ repos: entry: "(airflow\\.){0,1}utils\\.dates\\.days_ago" files: \.py$ pass_filenames: true + - id: remove-empty-init-py + name: Removes empty __init__.py files + language: system + entry: "./scripts/ci/pre_commit_remove_empty_init_py.sh" + files: __init__\.py$ + exclude: ^airflow/_vendor/.*$|node_modules|^pylint_plugins|^tests/__init__.py$ + pass_filenames: true - id: build name: Check if image build is needed entry: ./scripts/ci/pre_commit_ci_build.sh @@ -286,7 +293,12 @@ repos: entry: "./scripts/ci/pre_commit_mypy.sh" files: \.py$ exclude: ^airflow/_vendor/.*$ - pass_filenames: true + # MyPy does not work well when you have multiple files with same name (even in different packages) + # Passed as parameters - this is a known problem and it can be solved by running mypy on whole + # packages instead - MyPy is fast enough so this is not a problem to run it for all files + # even if few files change. See https://github.com/pre-commit/mirrors-mypy/issues/5 + pass_filenames: false + require_serial: true - id: pylint name: Run pylint for main sources language: system @@ -294,14 +306,13 @@ repos: files: \.py$ exclude: ^tests/.*\.py$|^airflow/_vendor/.*|^scripts/.*\.py$ pass_filenames: true - require_serial: true # Pylint tests should be run in one chunk to detect all cycles + require_serial: false - id: pylint-tests name: Run pylint for tests language: system entry: "./scripts/ci/pre_commit_pylint_tests.sh" files: ^tests/.*\.py$ pass_filenames: true - require_serial: true - id: flake8 name: Run flake8 language: system diff --git a/airflow/api/auth/backend/kerberos_auth.py b/airflow/api/auth/backend/kerberos_auth.py index 6c6d431eea659..fc1069d08233e 100644 --- a/airflow/api/auth/backend/kerberos_auth.py +++ b/airflow/api/auth/backend/kerberos_auth.py @@ -45,9 +45,12 @@ from functools import wraps from socket import getfqdn -import kerberos # noinspection PyProtectedMember from flask import Response, _request_ctx_stack as stack, g, make_response, request # type: ignore +from kerberos import ( # pylint: disable=no-name-in-module + AUTH_GSS_COMPLETE, AUTH_GSS_CONTINUE, GSSError, KrbError, authGSSServerClean, authGSSServerInit, + authGSSServerResponse, authGSSServerStep, authGSSServerUserName, getServerPrincipalDetails, +) from requests_kerberos import HTTPKerberosAuth from airflow.configuration import conf @@ -85,8 +88,8 @@ def init_app(app): try: log.info("Kerberos init: %s %s", service, hostname) - principal = kerberos.getServerPrincipalDetails(service, hostname) - except kerberos.KrbError as err: + principal = getServerPrincipalDetails(service, hostname) + except KrbError as err: log.warning("Kerberos: %s", err) else: log.info("Kerberos API: server is %s", principal) @@ -108,22 +111,22 @@ def _gssapi_authenticate(token): state = None ctx = stack.top try: - return_code, state = kerberos.authGSSServerInit(_KERBEROS_SERVICE.service_name) - if return_code != kerberos.AUTH_GSS_COMPLETE: + return_code, state = authGSSServerInit(_KERBEROS_SERVICE.service_name) + if return_code != AUTH_GSS_COMPLETE: return None - return_code = kerberos.authGSSServerStep(state, token) - if return_code == kerberos.AUTH_GSS_COMPLETE: - ctx.kerberos_token = kerberos.authGSSServerResponse(state) - ctx.kerberos_user = kerberos.authGSSServerUserName(state) + return_code = authGSSServerStep(state, token) + if return_code == AUTH_GSS_COMPLETE: + ctx.kerberos_token = authGSSServerResponse(state) + ctx.kerberos_user = authGSSServerUserName(state) return return_code - if return_code == kerberos.AUTH_GSS_CONTINUE: - return kerberos.AUTH_GSS_CONTINUE + if return_code == AUTH_GSS_CONTINUE: + return AUTH_GSS_CONTINUE return None - except kerberos.GSSError: + except GSSError: return None finally: if state: - kerberos.authGSSServerClean(state) + authGSSServerClean(state) def requires_authentication(function): @@ -135,7 +138,7 @@ def decorated(*args, **kwargs): ctx = stack.top token = ''.join(header.split()[1:]) return_code = _gssapi_authenticate(token) - if return_code == kerberos.AUTH_GSS_COMPLETE: + if return_code == AUTH_GSS_COMPLETE: g.user = ctx.kerberos_user response = function(*args, **kwargs) response = make_response(response) @@ -144,7 +147,7 @@ def decorated(*args, **kwargs): ctx.kerberos_token]) return response - if return_code != kerberos.AUTH_GSS_CONTINUE: + if return_code != AUTH_GSS_CONTINUE: return _forbidden() return _unauthorized() return decorated diff --git a/airflow/api/common/experimental/mark_tasks.py b/airflow/api/common/experimental/mark_tasks.py index d829923fab482..9eb17dc871f3b 100644 --- a/airflow/api/common/experimental/mark_tasks.py +++ b/airflow/api/common/experimental/mark_tasks.py @@ -22,7 +22,7 @@ from sqlalchemy import or_ -from airflow.jobs import BackfillJob +from airflow.jobs.backfill_job import BackfillJob from airflow.models import DagRun, TaskInstance from airflow.models.baseoperator import BaseOperator from airflow.operators.subdag_operator import SubDagOperator diff --git a/airflow/cli/__init__.py b/airflow/cli/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/cli/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/cli/commands/__init__.py b/airflow/cli/commands/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/cli/commands/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/cli/commands/kerberos_command.py b/airflow/cli/commands/kerberos_command.py index a75c596183f35..d1fe2cf382b33 100644 --- a/airflow/cli/commands/kerberos_command.py +++ b/airflow/cli/commands/kerberos_command.py @@ -20,7 +20,7 @@ from daemon.pidfile import TimeoutPIDLockFile from airflow import settings -from airflow.security import kerberos as krb +from airflow.security import kerberos_security as krb from airflow.utils import cli as cli_utils from airflow.utils.cli import setup_locations diff --git a/airflow/config_templates/__init__.py b/airflow/config_templates/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/config_templates/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/config_templates/config.yml b/airflow/config_templates/config.yml index 176ec7d178ff4..05820a8633feb 100644 --- a/airflow/config_templates/config.yml +++ b/airflow/config_templates/config.yml @@ -948,7 +948,7 @@ version_added: ~ type: string example: ~ - default: "airflow.utils.email.send_email_smtp" + default: "airflow.utils.email_utils.send_email_smtp" - name: default_email_on_retry description: | Whether email alerts should be sent when a task is retried @@ -963,11 +963,10 @@ type: boolean example: ~ default: "True" - - name: smtp description: | If you want airflow to send emails on retries, failure, and you want to use - the airflow.utils.email.send_email_smtp function, you have to configure an + the airflow.utils.email_utils.send_email_smtp function, you have to configure an smtp server here options: - name: smtp_host diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg index c879e1fc7883a..aab746896f5e6 100644 --- a/airflow/config_templates/default_airflow.cfg +++ b/airflow/config_templates/default_airflow.cfg @@ -454,7 +454,7 @@ session_lifetime_days = 30 # Configuration email backend and whether to # send email alerts on retry or failure # Email backend to use -email_backend = airflow.utils.email.send_email_smtp +email_backend = airflow.utils.email_utils.send_email_smtp # Whether email alerts should be sent when a task is retried default_email_on_retry = True @@ -465,7 +465,7 @@ default_email_on_failure = True [smtp] # If you want airflow to send emails on retries, failure, and you want to use -# the airflow.utils.email.send_email_smtp function, you have to configure an +# the airflow.utils.email_utils.send_email_smtp function, you have to configure an # smtp server here smtp_host = localhost smtp_starttls = True diff --git a/airflow/config_templates/default_test.cfg b/airflow/config_templates/default_test.cfg index 932754a4014a4..05f712477d79e 100644 --- a/airflow/config_templates/default_test.cfg +++ b/airflow/config_templates/default_test.cfg @@ -79,7 +79,7 @@ hide_paused_dags_by_default = False page_size = 100 [email] -email_backend = airflow.utils.email.send_email_smtp +email_backend = airflow.utils.email_utils.send_email_smtp [smtp] smtp_host = localhost diff --git a/airflow/contrib/__init__.py b/airflow/contrib/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/contrib/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/contrib/auth/__init__.py b/airflow/contrib/auth/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/contrib/auth/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/contrib/auth/backends/__init__.py b/airflow/contrib/auth/backends/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/contrib/auth/backends/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/api/auth/backend/__init__.py b/airflow/contrib/auth/backends/authentication_error.py similarity index 89% rename from airflow/api/auth/backend/__init__.py rename to airflow/contrib/auth/backends/authentication_error.py index 217e5db960782..ca6253160ccc7 100644 --- a/airflow/api/auth/backend/__init__.py +++ b/airflow/contrib/auth/backends/authentication_error.py @@ -1,4 +1,3 @@ -# # 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 @@ -15,3 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + + +class AuthenticationError(Exception): + """Error returned on authentication problems""" diff --git a/airflow/contrib/auth/backends/github_enterprise_auth.py b/airflow/contrib/auth/backends/github_enterprise_auth.py index 3ec6bf44746a6..0dbed0b7ac0fd 100644 --- a/airflow/contrib/auth/backends/github_enterprise_auth.py +++ b/airflow/contrib/auth/backends/github_enterprise_auth.py @@ -26,6 +26,7 @@ from airflow import models from airflow.configuration import AirflowConfigException, conf +from airflow.contrib.auth.backends.authentication_error import AuthenticationError from airflow.utils.session import provide_session log = logging.getLogger(__name__) @@ -68,10 +69,6 @@ def is_superuser(self): return True -class AuthenticationError(Exception): - pass - - class GHEAuthBackend: def __init__(self): diff --git a/airflow/contrib/auth/backends/google_auth.py b/airflow/contrib/auth/backends/google_auth.py index 4e4f6066370e4..c420083e21a15 100644 --- a/airflow/contrib/auth/backends/google_auth.py +++ b/airflow/contrib/auth/backends/google_auth.py @@ -26,6 +26,7 @@ from airflow import models from airflow.configuration import conf +from airflow.contrib.auth.backends.authentication_error import AuthenticationError from airflow.utils.session import provide_session log = logging.getLogger(__name__) @@ -68,10 +69,6 @@ def is_superuser(self): return True -class AuthenticationError(Exception): - pass - - class GoogleAuthBackend: def __init__(self): diff --git a/airflow/contrib/auth/backends/kerberos_auth.py b/airflow/contrib/auth/backends/kerberos_auth.py index ee28a7d52b296..a4d85ed8d91e9 100644 --- a/airflow/contrib/auth/backends/kerberos_auth.py +++ b/airflow/contrib/auth/backends/kerberos_auth.py @@ -29,6 +29,7 @@ from airflow import models from airflow.configuration import conf +from airflow.contrib.auth.backends.authentication_error import AuthenticationError from airflow.exceptions import AirflowConfigException from airflow.security import utils from airflow.utils.log.logging_mixin import LoggingMixin @@ -40,10 +41,6 @@ LOGIN_MANAGER.login_message = None -class AuthenticationError(Exception): - """Error raised when authentication error occurs""" - - class KerberosUser(models.User, LoggingMixin): """User authenticated with Kerberos""" def __init__(self, user): diff --git a/airflow/contrib/auth/backends/ldap_auth.py b/airflow/contrib/auth/backends/ldap_auth.py index defaaad455664..4f405e8df705b 100644 --- a/airflow/contrib/auth/backends/ldap_auth.py +++ b/airflow/contrib/auth/backends/ldap_auth.py @@ -29,6 +29,7 @@ from airflow import models from airflow.configuration import AirflowConfigException, conf +from airflow.contrib.auth.backends.authentication_error import AuthenticationError from airflow.utils.session import provide_session login_manager = flask_login.LoginManager() @@ -38,10 +39,6 @@ log = logging.getLogger(__name__) -class AuthenticationError(Exception): - pass - - class LdapException(Exception): pass diff --git a/airflow/contrib/auth/backends/password_auth.py b/airflow/contrib/auth/backends/password_auth.py index 2c896cb812478..1fd46bf7c17ad 100644 --- a/airflow/contrib/auth/backends/password_auth.py +++ b/airflow/contrib/auth/backends/password_auth.py @@ -32,6 +32,7 @@ from wtforms.validators import InputRequired from airflow import models +from airflow.contrib.auth.backends.authentication_error import AuthenticationError from airflow.utils.session import create_session, provide_session LOGIN_MANAGER = flask_login.LoginManager() @@ -44,10 +45,6 @@ CLIENT_AUTH = None -class AuthenticationError(Exception): - """Error returned on authentication problems""" - - # pylint: disable=no-member # noinspection PyUnresolvedReferences class PasswordUser(models.User): diff --git a/airflow/contrib/hooks/cassandra_hook.py b/airflow/contrib/hooks/cassandra_hook.py index c0002862ae264..e49cfc23b5d71 100644 --- a/airflow/contrib/hooks/cassandra_hook.py +++ b/airflow/contrib/hooks/cassandra_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.apache.cassandra.hooks.cassandra`.""" +"""This module is deprecated. Please use `airflow.providers.apache.cassandra.hooks.airflow_cassandra`.""" import warnings # pylint: disable=unused-import -from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook # noqa +from airflow.providers.apache.cassandra.hooks.airflow_cassandra import CassandraHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.apache.cassandra.hooks.cassandra`.", + "This module is deprecated. Please use `airflow.providers.apache.cassandra.hooks.airflow_cassandra`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/hooks/cloudant_hook.py b/airflow/contrib/hooks/cloudant_hook.py index 453dd36a99abd..67c0b5256d15f 100644 --- a/airflow/contrib/hooks/cloudant_hook.py +++ b/airflow/contrib/hooks/cloudant_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.cloudant.hooks.cloudant`.""" +"""This module is deprecated. Please use `airflow.providers.cloudant.hooks.airflow_cloudant`.""" import warnings # pylint: disable=unused-import -from airflow.providers.cloudant.hooks.cloudant import CloudantHook # noqa +from airflow.providers.cloudant.hooks.airflow_cloudant import CloudantHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.cloudant.hooks.cloudant`.", + "This module is deprecated. Please use `airflow.providers.cloudant.hooks.airflow_cloudant`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/hooks/gcp_dataproc_hook.py b/airflow/contrib/hooks/gcp_dataproc_hook.py index 75c6df88a9d33..e3e3b99c0f0de 100644 --- a/airflow/contrib/hooks/gcp_dataproc_hook.py +++ b/airflow/contrib/hooks/gcp_dataproc_hook.py @@ -36,7 +36,7 @@ class DataProcHook(DataprocHook): def __init__(self, *args, **kwargs): warnings.warn( """This class is deprecated. - Please use `airflow.providers.google.cloud.hooks.dataproc.DataprocHook`.""", + Please use `airflow.providers.google.cloud.hooks.airflow_dataproc.DataprocHook`.""", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/hooks/grpc_hook.py b/airflow/contrib/hooks/grpc_hook.py index 7f89d401169ed..0f8e17774fdad 100644 --- a/airflow/contrib/hooks/grpc_hook.py +++ b/airflow/contrib/hooks/grpc_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.grpc.hooks.grpc`.""" +"""This module is deprecated. Please use `airflow.providers.grpc.hooks.airflow_grpc`.""" import warnings # pylint: disable=unused-import -from airflow.providers.grpc.hooks.grpc import GrpcHook # noqa +from airflow.providers.grpc.hooks.airflow_grpc import GrpcHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.grpc.hooks.grpc`.", + "This module is deprecated. Please use `airflow.providers.grpc.hooks.airflow_grpc`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/hooks/jira_hook.py b/airflow/contrib/hooks/jira_hook.py index 93f9b19c6dff0..a90a8ac7c7de4 100644 --- a/airflow/contrib/hooks/jira_hook.py +++ b/airflow/contrib/hooks/jira_hook.py @@ -16,15 +16,15 @@ # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.jira.hooks.jira`.""" +"""This module is deprecated. Please use `airflow.providers.jira.hooks.airflow_jira`.""" import warnings # pylint: disable=unused-import -from airflow.providers.jira.hooks.jira import JiraHook # noqa +from airflow.providers.jira.hooks.airflow_jira import JiraHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.jira.hooks.jira`.", + "This module is deprecated. Please use `airflow.providers.jira.hooks.airflow_jira`.", DeprecationWarning, stacklevel=2, ) diff --git a/airflow/contrib/hooks/redis_hook.py b/airflow/contrib/hooks/redis_hook.py index 7938f57a4ac2b..d23adb7146fcc 100644 --- a/airflow/contrib/hooks/redis_hook.py +++ b/airflow/contrib/hooks/redis_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.redis.hooks.redis`.""" +"""This module is deprecated. Please use `airflow.providers.redis.hooks.airflow_redis`.""" import warnings # pylint: disable=unused-import -from airflow.providers.redis.hooks.redis import RedisHook # noqa +from airflow.providers.redis.hooks.airflow_redis import RedisHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.redis.hooks.redis`.", + "This module is deprecated. Please use `airflow.providers.redis.hooks.airflow_redis`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/hooks/snowflake_hook.py b/airflow/contrib/hooks/snowflake_hook.py index e7df2bbb4b263..28a7140453190 100644 --- a/airflow/contrib/hooks/snowflake_hook.py +++ b/airflow/contrib/hooks/snowflake_hook.py @@ -16,15 +16,15 @@ # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.snowflake.hooks.snowflake`.""" +"""This module is deprecated. Please use `airflow.providers.snowflake.hooks.airflow_snowflake`.""" import warnings # pylint: disable=unused-import -from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook # noqa +from airflow.providers.snowflake.hooks.airflow_snowflake import SnowflakeHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.snowflake.hooks.snowflake`.", + "This module is deprecated. Please use `airflow.providers.snowflake.hooks.airflow_snowflake`.", DeprecationWarning, stacklevel=2, ) diff --git a/airflow/contrib/hooks/winrm_hook.py b/airflow/contrib/hooks/winrm_hook.py index c45c825404d04..f34f1391f3cc8 100644 --- a/airflow/contrib/hooks/winrm_hook.py +++ b/airflow/contrib/hooks/winrm_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.microsoft.winrm.hooks.winrm`.""" +"""This module is deprecated. Please use `airflow.providers.microsoft.winrm.hooks.airflow_winrm`.""" import warnings # pylint: disable=unused-import -from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook # noqa +from airflow.providers.microsoft.winrm.hooks.airflow_winrm import WinRMHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.microsoft.winrm.hooks.winrm`.", + "This module is deprecated. Please use `airflow.providers.microsoft.winrm.hooks.airflow_winrm`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/operators/grpc_operator.py b/airflow/contrib/operators/grpc_operator.py index 03a9b6e249dae..78fe5e1ccf3c5 100644 --- a/airflow/contrib/operators/grpc_operator.py +++ b/airflow/contrib/operators/grpc_operator.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.grpc.operators.grpc`.""" +"""This module is deprecated. Please use `airflow.providers.grpc.operators.airflow_grpc`.""" import warnings # pylint: disable=unused-import -from airflow.providers.grpc.operators.grpc import GrpcOperator # noqa +from airflow.providers.grpc.operators.airflow_grpc import GrpcOperator # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.grpc.operators.grpc`.", + "This module is deprecated. Please use `airflow.providers.grpc.operators.airflow_grpc`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/operators/winrm_operator.py b/airflow/contrib/operators/winrm_operator.py index 9d24e774b7e34..64c84a4bfe8ac 100644 --- a/airflow/contrib/operators/winrm_operator.py +++ b/airflow/contrib/operators/winrm_operator.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.microsoft.winrm.operators.winrm`.""" +"""This module is deprecated. Please use `airflow.providers.microsoft.winrm.operators.airflow_winrm`.""" import warnings # pylint: disable=unused-import -from airflow.providers.microsoft.winrm.operators.winrm import WinRMOperator # noqa +from airflow.providers.microsoft.winrm.operators.airflow_winrm import WinRMOperator # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.microsoft.winrm.operators.winrm`.", + "This module is deprecated. Please use `airflow.providers.microsoft.winrm.operators.airflow_winrm`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/sensors/datadog_sensor.py b/airflow/contrib/sensors/datadog_sensor.py index d32445068c641..26861a7546235 100644 --- a/airflow/contrib/sensors/datadog_sensor.py +++ b/airflow/contrib/sensors/datadog_sensor.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.datadog.sensors.datadog`.""" +"""This module is deprecated. Please use `airflow.providers.datadog.sensors.airflow_datadog`.""" import warnings # pylint: disable=unused-import -from airflow.providers.datadog.sensors.datadog import DatadogSensor # noqa +from airflow.providers.datadog.sensors.airflow_datadog import DatadogSensor # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.datadog.sensors.datadog`.", + "This module is deprecated. Please use `airflow.providers.datadog.sensors.airflow_datadog`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/contrib/sensors/jira_sensor.py b/airflow/contrib/sensors/jira_sensor.py index a0ae0173f2e8e..b1c39197ed594 100644 --- a/airflow/contrib/sensors/jira_sensor.py +++ b/airflow/contrib/sensors/jira_sensor.py @@ -21,7 +21,7 @@ import warnings # pylint: disable=unused-import -from airflow.providers.jira.sensors.jira import JiraSensor, JiraTicketSensor # noqa +from airflow.providers.jira.sensors.airflow_jira import JiraSensor, JiraTicketSensor # noqa warnings.warn( "This module is deprecated. Please use `airflow.providers.jira.sensors.jira`.", diff --git a/airflow/contrib/utils/__init__.py b/airflow/contrib/utils/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/contrib/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/contrib/utils/sendgrid.py b/airflow/contrib/utils/airflow_sendgrid.py similarity index 96% rename from airflow/contrib/utils/sendgrid.py rename to airflow/contrib/utils/airflow_sendgrid.py index d9837077e64ac..239d1cd7632aa 100644 --- a/airflow/contrib/utils/sendgrid.py +++ b/airflow/contrib/utils/airflow_sendgrid.py @@ -29,7 +29,7 @@ Attachment, Category, Content, CustomArg, Email, Mail, MailSettings, Personalization, SandBoxMode, ) -from airflow.utils.email import get_email_address_list +from airflow.utils.email_utils import get_email_address_list log = logging.getLogger(__name__) @@ -48,7 +48,7 @@ def send_email(to, subject, html_content, files=None, cc=None, 1. Update ``email_backend`` property in `[email]`` section in ``airflow.cfg``, i.e.,:: [email] - email_backend = airflow.contrib.utils.sendgrid.send_email + email_backend = airflow.contrib.utils.airflow_sendgrid.send_email 2. Configure Sendgrid specific environment variables at all Airflow instances::: diff --git a/airflow/contrib/utils/log/__init__.py b/airflow/contrib/utils/log/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/contrib/utils/log/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/dag/__init__.py b/airflow/dag/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/dag/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/example_dags/__init__.py b/airflow/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/example_dags/example_skip_dag.py b/airflow/example_dags/example_skip_dag.py index 83fbf4970952a..4c26b93fd83b9 100644 --- a/airflow/example_dags/example_skip_dag.py +++ b/airflow/example_dags/example_skip_dag.py @@ -19,7 +19,7 @@ """Example DAG demonstrating the DummyOperator and a custom DummySkipOperator which skips by default.""" from airflow.exceptions import AirflowSkipException -from airflow.models import DAG +from airflow.models.dag import DAG from airflow.operators.dummy_operator import DummyOperator from airflow.utils.dates import days_ago diff --git a/airflow/example_dags/libs/__init__.py b/airflow/example_dags/libs/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/example_dags/libs/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/example_dags/subdags/__init__.py b/airflow/example_dags/subdags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/example_dags/subdags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/hooks/docker_hook.py b/airflow/hooks/docker_hook.py index b7da340770da6..1ed49f228cbaa 100644 --- a/airflow/hooks/docker_hook.py +++ b/airflow/hooks/docker_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.docker.hooks.docker`.""" +"""This module is deprecated. Please use `airflow.providers.docker.hooks.aiflow_docker`.""" import warnings # pylint: disable=unused-import -from airflow.providers.docker.hooks.docker import DockerHook # noqa +from airflow.providers.docker.hooks.airflow_docker import DockerHook # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.docker.hooks.docker`.", + "This module is deprecated. Please use `airflow.providers.docker.hooks.airflow_docker`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/hooks/hdfs_hook.py b/airflow/hooks/hdfs_hook.py index 10e81c5c6d39e..ab86f460e965d 100644 --- a/airflow/hooks/hdfs_hook.py +++ b/airflow/hooks/hdfs_hook.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.apache.hdfs.hooks.hdfs`.""" +"""This module is deprecated. Please use `airflow.providers.apache.hdfs.hooks.airflow_hdfs`.""" import warnings # pylint: disable=unused-import -from airflow.providers.apache.hdfs.hooks.hdfs import HDFSHook, HDFSHookException # noqa +from airflow.providers.apache.hdfs.hooks.airflow_hdfs import HDFSHook, HDFSHookException # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.apache.hdfs.hooks.hdfs`.", + "This module is deprecated. Please use `airflow.providers.apache.hdfs.hooks.airflow_hdfs`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/jobs/base_job.py b/airflow/jobs/base_job.py index 23ee7e2b05caa..fc70e77e16a54 100644 --- a/airflow/jobs/base_job.py +++ b/airflow/jobs/base_job.py @@ -36,7 +36,7 @@ from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.net import get_hostname from airflow.utils.session import create_session, provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime from airflow.utils.state import State diff --git a/airflow/jobs/scheduler_job.py b/airflow/jobs/scheduler_job.py index 66b6faaee64b3..e631cd4fdac60 100644 --- a/airflow/jobs/scheduler_job.py +++ b/airflow/jobs/scheduler_job.py @@ -48,7 +48,7 @@ from airflow.utils.dag_processing import ( AbstractDagFileProcessorProcess, DagFileProcessorAgent, SimpleDag, SimpleDagBag, ) -from airflow.utils.email import get_email_address_list, send_email +from airflow.utils.email_utils import get_email_address_list, send_email from airflow.utils.file import list_py_file_paths from airflow.utils.log.logging_mixin import LoggingMixin, StreamLogWriter, set_context from airflow.utils.session import provide_session diff --git a/airflow/kubernetes/pod_launcher.py b/airflow/kubernetes/pod_launcher.py index c0b5286929292..34a1b54a255c2 100644 --- a/airflow/kubernetes/pod_launcher.py +++ b/airflow/kubernetes/pod_launcher.py @@ -28,13 +28,12 @@ from requests.exceptions import BaseHTTPError from airflow.exceptions import AirflowException +from airflow.kubernetes.kube_client import get_kube_client from airflow.kubernetes.pod_generator import PodDefaults from airflow.settings import pod_mutation_hook from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.state import State -from .kube_client import get_kube_client - class PodStatus: """Status of the PODs""" diff --git a/airflow/migrations/__init__.py b/airflow/migrations/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/migrations/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/migrations/versions/6e96a59344a4_make_taskinstance_pool_not_nullable.py b/airflow/migrations/versions/6e96a59344a4_make_taskinstance_pool_not_nullable.py index 01460389314ff..aaef306d95c0a 100644 --- a/airflow/migrations/versions/6e96a59344a4_make_taskinstance_pool_not_nullable.py +++ b/airflow/migrations/versions/6e96a59344a4_make_taskinstance_pool_not_nullable.py @@ -31,7 +31,7 @@ from sqlalchemy.ext.declarative import declarative_base from airflow.utils.session import create_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime # revision identifiers, used by Alembic. revision = '6e96a59344a4' diff --git a/airflow/migrations/versions/__init__.py b/airflow/migrations/versions/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/migrations/versions/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/models/connection.py b/airflow/models/connection.py index cf0f7d5beb182..43c0d5f6ff1a4 100644 --- a/airflow/models/connection.py +++ b/airflow/models/connection.py @@ -41,9 +41,10 @@ "airflow.providers.microsoft.azure.hooks.azure_data_lake.AzureDataLakeHook", "azure_data_lake_conn_id", ), - "cassandra": ("airflow.providers.apache.cassandra.hooks.cassandra.CassandraHook", "cassandra_conn_id"), - "cloudant": ("airflow.providers.cloudant.hooks.cloudant.CloudantHook", "cloudant_conn_id"), - "docker": ("airflow.providers.docker.hooks.docker.DockerHook", "docker_conn_id"), + "cassandra": ("airflow.providers.apache.cassandra.hooks.airflow_cassandra.CassandraHook", + "cassandra_conn_id"), + "cloudant": ("airflow.providers.cloudant.hooks.airflow_cloudant.CloudantHook", "cloudant_conn_id"), + "docker": ("airflow.providers.docker.hooks.airfllow_docker.DockerHook", "docker_conn_id"), "gcpcloudsql": ( "airflow.providers.google.cloud.hooks.cloud_sql.CloudSQLDatabaseHook", "gcp_cloudsql_conn_id", @@ -52,11 +53,11 @@ "airflow.providers.google.cloud.hooks.bigquery.BigQueryHook", "bigquery_conn_id", ), - "grpc": ("airflow.providers.grpc.hooks.grpc.GrpcHook", "grpc_conn_id"), + "grpc": ("airflow.providers.grpc.hooks.airflow_grpc.GrpcHook", "grpc_conn_id"), "hive_cli": ("airflow.providers.apache.hive.hooks.hive.HiveCliHook", "hive_cli_conn_id"), "hiveserver2": ("airflow.providers.apache.hive.hooks.hive.HiveServer2Hook", "hiveserver2_conn_id"), "jdbc": ("airflow.providers.jdbc.hooks.jdbc.JdbcHook", "jdbc_conn_id"), - "jira": ("airflow.providers.jira.hooks.jira.JiraHook", "jira_conn_id"), + "jira": ("airflow.providers.jira.hooks.airflow_jira.JiraHook", "jira_conn_id"), "mongo": ("airflow.providers.mongo.hooks.mongo.MongoHook", "conn_id"), "mssql": ("airflow.providers.microsoft.mssql.hooks.mssql.MsSqlHook", "mssql_conn_id"), "mysql": ("airflow.providers.mysql.hooks.mysql.MySqlHook", "mysql_conn_id"), @@ -65,7 +66,7 @@ "pig_cli": ("airflow.providers.apache.pig.hooks.pig.PigCliHook", "pig_cli_conn_id"), "postgres": ("airflow.providers.postgres.hooks.postgres.PostgresHook", "postgres_conn_id"), "presto": ("airflow.providers.presto.hooks.presto.PrestoHook", "presto_conn_id"), - "redis": ("airflow.providers.redis.hooks.redis.RedisHook", "redis_conn_id"), + "redis": ("airflow.providers.redis.hooks.airflow_redis.RedisHook", "redis_conn_id"), "sqlite": ("airflow.providers.sqlite.hooks.sqlite.SqliteHook", "sqlite_conn_id"), "vertica": ("airflow.providers.vertica.hooks.vertica.VerticaHook", "vertica_conn_id"), "wasb": ("airflow.providers.microsoft.azure.hooks.wasb.WasbHook", "wasb_conn_id"), diff --git a/airflow/models/dag.py b/airflow/models/dag.py index 87f084c77f042..b810728e07f57 100644 --- a/airflow/models/dag.py +++ b/airflow/models/dag.py @@ -54,7 +54,7 @@ from airflow.utils.helpers import validate_key from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import Interval, UtcDateTime +from airflow.utils.sqlalchemy_utils import Interval, UtcDateTime from airflow.utils.state import State log = logging.getLogger(__name__) diff --git a/airflow/models/dagpickle.py b/airflow/models/dagpickle.py index e16c046e005de..a80cd6f95e880 100644 --- a/airflow/models/dagpickle.py +++ b/airflow/models/dagpickle.py @@ -21,7 +21,7 @@ from airflow.models.base import Base from airflow.utils import timezone -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class DagPickle(Base): diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py index f736fd3b37aa7..44570733188a0 100644 --- a/airflow/models/dagrun.py +++ b/airflow/models/dagrun.py @@ -31,7 +31,7 @@ from airflow.utils import timezone from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime from airflow.utils.state import State diff --git a/airflow/models/errors.py b/airflow/models/errors.py index 76c8ffb43e728..3791fe0cd0a2f 100644 --- a/airflow/models/errors.py +++ b/airflow/models/errors.py @@ -19,7 +19,7 @@ from sqlalchemy import Column, Integer, String, Text from airflow.models.base import Base -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class ImportError(Base): diff --git a/airflow/models/log.py b/airflow/models/log.py index ee3b936b22524..5ac6c5404b460 100644 --- a/airflow/models/log.py +++ b/airflow/models/log.py @@ -20,7 +20,7 @@ from airflow.models.base import ID_LEN, Base from airflow.utils import timezone -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class Log(Base): diff --git a/airflow/models/serialized_dag.py b/airflow/models/serialized_dag.py index 38f2d32c8d196..5e360ff736e0c 100644 --- a/airflow/models/serialized_dag.py +++ b/airflow/models/serialized_dag.py @@ -33,7 +33,7 @@ from airflow.settings import json from airflow.utils import timezone from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime log = logging.getLogger(__name__) diff --git a/airflow/models/slamiss.py b/airflow/models/slamiss.py index 696f7b438e320..e7b2022e75e41 100644 --- a/airflow/models/slamiss.py +++ b/airflow/models/slamiss.py @@ -19,7 +19,7 @@ from sqlalchemy import Boolean, Column, Index, String, Text from airflow.models.base import ID_LEN, Base -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class SlaMiss(Base): diff --git a/airflow/models/taskfail.py b/airflow/models/taskfail.py index d48831117cb55..35fd7e2ca86c0 100644 --- a/airflow/models/taskfail.py +++ b/airflow/models/taskfail.py @@ -19,7 +19,7 @@ from sqlalchemy import Column, Index, Integer, String from airflow.models.base import ID_LEN, Base -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class TaskFail(Base): diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py index 028cfc5ca404e..8f5c27272342a 100644 --- a/airflow/models/taskinstance.py +++ b/airflow/models/taskinstance.py @@ -51,12 +51,12 @@ from airflow.stats import Stats from airflow.ti_deps.dep_context import REQUEUEABLE_DEPS, RUNNING_DEPS, DepContext from airflow.utils import timezone -from airflow.utils.email import send_email +from airflow.utils.email_utils import send_email from airflow.utils.helpers import is_container from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.net import get_hostname from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime from airflow.utils.state import State from airflow.utils.timeout import timeout diff --git a/airflow/models/taskreschedule.py b/airflow/models/taskreschedule.py index 74ca7f10fcfa1..db447345cfe9f 100644 --- a/airflow/models/taskreschedule.py +++ b/airflow/models/taskreschedule.py @@ -20,7 +20,7 @@ from airflow.models.base import ID_LEN, Base from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime class TaskReschedule(Base): diff --git a/airflow/models/xcom.py b/airflow/models/xcom.py index eecc98c2a02b5..464cb83951661 100644 --- a/airflow/models/xcom.py +++ b/airflow/models/xcom.py @@ -31,7 +31,7 @@ from airflow.utils.helpers import is_container from airflow.utils.log.logging_mixin import LoggingMixin from airflow.utils.session import provide_session -from airflow.utils.sqlalchemy import UtcDateTime +from airflow.utils.sqlalchemy_utils import UtcDateTime log = logging.getLogger(__name__) diff --git a/airflow/operators/docker_operator.py b/airflow/operators/docker_operator.py index 245ee589c0196..9dac81ab6e384 100644 --- a/airflow/operators/docker_operator.py +++ b/airflow/operators/docker_operator.py @@ -15,14 +15,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -"""This module is deprecated. Please use `airflow.providers.docker.operators.docker`.""" +"""This module is deprecated. Please use `airflow.providers.docker.operators.docker_operator`.""" import warnings # pylint: disable=unused-import -from airflow.providers.docker.operators.docker import DockerOperator # noqa +from airflow.providers.docker.operators.docker_operator import DockerOperator # noqa warnings.warn( - "This module is deprecated. Please use `airflow.providers.docker.operators.docker`.", + "This module is deprecated. Please use `airflow.providers.docker.operators.docker_operator`.", DeprecationWarning, stacklevel=2 ) diff --git a/airflow/providers/__init__.py b/airflow/providers/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/__init__.py b/airflow/providers/amazon/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/aws/__init__.py b/airflow/providers/amazon/aws/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/aws/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/aws/example_dags/__init__.py b/airflow/providers/amazon/aws/example_dags/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/aws/example_dags/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/aws/hooks/__init__.py b/airflow/providers/amazon/aws/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/aws/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/aws/operators/__init__.py b/airflow/providers/amazon/aws/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/aws/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/amazon/aws/sensors/__init__.py b/airflow/providers/amazon/aws/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/amazon/aws/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/apache/__init__.py b/airflow/providers/apache/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/apache/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/apache/cassandra/__init__.py b/airflow/providers/apache/cassandra/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/apache/cassandra/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/apache/cassandra/hooks/__init__.py b/airflow/providers/apache/cassandra/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/apache/cassandra/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/apache/cassandra/hooks/cassandra.py b/airflow/providers/apache/cassandra/hooks/airflow_cassandra.py similarity index 100% rename from airflow/providers/apache/cassandra/hooks/cassandra.py rename to airflow/providers/apache/cassandra/hooks/airflow_cassandra.py diff --git a/airflow/providers/apache/cassandra/sensors/__init__.py b/airflow/providers/apache/cassandra/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/apache/cassandra/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/apache/cassandra/sensors/record.py b/airflow/providers/apache/cassandra/sensors/record.py index 268ca44523f97..d83e2bd75bf58 100644 --- a/airflow/providers/apache/cassandra/sensors/record.py +++ b/airflow/providers/apache/cassandra/sensors/record.py @@ -22,7 +22,7 @@ from typing import Dict -from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook +from airflow.providers.apache.cassandra.hooks.airflow_cassandra import CassandraHook from airflow.sensors.base_sensor_operator import BaseSensorOperator from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/apache/cassandra/sensors/table.py b/airflow/providers/apache/cassandra/sensors/table.py index 47b9679e989bc..f3fa28cedc8c3 100644 --- a/airflow/providers/apache/cassandra/sensors/table.py +++ b/airflow/providers/apache/cassandra/sensors/table.py @@ -23,7 +23,7 @@ from typing import Dict -from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook +from airflow.providers.apache.cassandra.hooks.airflow_cassandra import CassandraHook from airflow.sensors.base_sensor_operator import BaseSensorOperator from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/apache/druid/__init__.py b/airflow/providers/apache/druid/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/druid/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/druid/hooks/__init__.py b/airflow/providers/apache/druid/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/druid/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/druid/operators/__init__.py b/airflow/providers/apache/druid/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/druid/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hdfs/__init__.py b/airflow/providers/apache/hdfs/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hdfs/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hdfs/hooks/__init__.py b/airflow/providers/apache/hdfs/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hdfs/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hdfs/hooks/hdfs.py b/airflow/providers/apache/hdfs/hooks/airflow_hdfs.py similarity index 100% rename from airflow/providers/apache/hdfs/hooks/hdfs.py rename to airflow/providers/apache/hdfs/hooks/airflow_hdfs.py diff --git a/airflow/providers/apache/hdfs/sensors/__init__.py b/airflow/providers/apache/hdfs/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hdfs/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hdfs/sensors/hdfs.py b/airflow/providers/apache/hdfs/sensors/hdfs.py index 8452c856573a2..08a679c92322b 100644 --- a/airflow/providers/apache/hdfs/sensors/hdfs.py +++ b/airflow/providers/apache/hdfs/sensors/hdfs.py @@ -20,7 +20,7 @@ import sys from airflow import settings -from airflow.providers.apache.hdfs.hooks.hdfs import HDFSHook +from airflow.providers.apache.hdfs.hooks.airflow_hdfs import HDFSHook from airflow.sensors.base_sensor_operator import BaseSensorOperator from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/apache/hive/__init__.py b/airflow/providers/apache/hive/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hive/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hive/example_dags/__init__.py b/airflow/providers/apache/hive/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hive/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hive/hooks/__init__.py b/airflow/providers/apache/hive/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hive/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hive/operators/__init__.py b/airflow/providers/apache/hive/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hive/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/hive/sensors/__init__.py b/airflow/providers/apache/hive/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/hive/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pig/__init__.py b/airflow/providers/apache/pig/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pig/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pig/example_dags/__init__.py b/airflow/providers/apache/pig/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pig/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pig/hooks/__init__.py b/airflow/providers/apache/pig/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pig/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pig/operators/__init__.py b/airflow/providers/apache/pig/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pig/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pinot/__init__.py b/airflow/providers/apache/pinot/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pinot/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/pinot/hooks/__init__.py b/airflow/providers/apache/pinot/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/pinot/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/spark/__init__.py b/airflow/providers/apache/spark/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/spark/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/spark/hooks/__init__.py b/airflow/providers/apache/spark/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/spark/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/spark/operators/__init__.py b/airflow/providers/apache/spark/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/spark/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/sqoop/__init__.py b/airflow/providers/apache/sqoop/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/sqoop/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/sqoop/hooks/__init__.py b/airflow/providers/apache/sqoop/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/sqoop/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/apache/sqoop/operators/__init__.py b/airflow/providers/apache/sqoop/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/apache/sqoop/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/celery/__init__.py b/airflow/providers/celery/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/celery/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/celery/sensors/__init__.py b/airflow/providers/celery/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/celery/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cloudant/__init__.py b/airflow/providers/cloudant/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cloudant/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cloudant/hooks/__init__.py b/airflow/providers/cloudant/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cloudant/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cloudant/hooks/cloudant.py b/airflow/providers/cloudant/hooks/airflow_cloudant.py similarity index 100% rename from airflow/providers/cloudant/hooks/cloudant.py rename to airflow/providers/cloudant/hooks/airflow_cloudant.py diff --git a/airflow/providers/cncf/__init__.py b/airflow/providers/cncf/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cncf/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cncf/kubernetes/__init__.py b/airflow/providers/cncf/kubernetes/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cncf/kubernetes/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cncf/kubernetes/example_dags/__init__.py b/airflow/providers/cncf/kubernetes/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cncf/kubernetes/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/cncf/kubernetes/operators/__init__.py b/airflow/providers/cncf/kubernetes/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/cncf/kubernetes/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/databricks/__init__.py b/airflow/providers/databricks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/databricks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/databricks/example_dags/__init__.py b/airflow/providers/databricks/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/databricks/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/databricks/hooks/__init__.py b/airflow/providers/databricks/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/databricks/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/databricks/operators/__init__.py b/airflow/providers/databricks/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/databricks/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/datadog/__init__.py b/airflow/providers/datadog/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/datadog/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/datadog/hooks/__init__.py b/airflow/providers/datadog/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/datadog/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/datadog/sensors/__init__.py b/airflow/providers/datadog/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/datadog/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/datadog/sensors/datadog.py b/airflow/providers/datadog/sensors/airflow_datadog.py similarity index 100% rename from airflow/providers/datadog/sensors/datadog.py rename to airflow/providers/datadog/sensors/airflow_datadog.py diff --git a/airflow/providers/dingding/__init__.py b/airflow/providers/dingding/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/dingding/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/dingding/example_dags/__init__.py b/airflow/providers/dingding/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/dingding/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/dingding/hooks/__init__.py b/airflow/providers/dingding/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/dingding/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/dingding/operators/__init__.py b/airflow/providers/dingding/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/dingding/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/discord/__init__.py b/airflow/providers/discord/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/discord/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/discord/hooks/__init__.py b/airflow/providers/discord/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/discord/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/discord/operators/__init__.py b/airflow/providers/discord/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/discord/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/docker/__init__.py b/airflow/providers/docker/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/docker/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/docker/example_dags/__init__.py b/airflow/providers/docker/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/docker/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/docker/example_dags/example_docker_copy_data.py b/airflow/providers/docker/example_dags/example_docker_copy_data.py index e3a61269161ad..0e3abd3f9868e 100644 --- a/airflow/providers/docker/example_dags/example_docker_copy_data.py +++ b/airflow/providers/docker/example_dags/example_docker_copy_data.py @@ -30,7 +30,7 @@ from airflow import DAG from airflow.operators.bash import BashOperator from airflow.operators.python import ShortCircuitOperator -from airflow.providers.docker.operators.docker import DockerOperator +from airflow.providers.docker.operators.docker_operator import DockerOperator from airflow.utils.dates import days_ago default_args = { diff --git a/airflow/providers/docker/example_dags/example_docker_operator.py b/airflow/providers/docker/example_dags/example_docker_operator.py index 1c6226f911226..0f154fc0227ba 100644 --- a/airflow/providers/docker/example_dags/example_docker_operator.py +++ b/airflow/providers/docker/example_dags/example_docker_operator.py @@ -20,7 +20,7 @@ from airflow import DAG from airflow.operators import BashOperator from datetime import timedelta -from airflow.providers.docker.operators.docker import DockerOperator +from airflow.providers.docker.operators.airflow_docker import DockerOperator default_args = { 'owner': 'airflow', diff --git a/airflow/providers/docker/hooks/__init__.py b/airflow/providers/docker/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/docker/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/docker/hooks/docker.py b/airflow/providers/docker/hooks/airflow_docker.py similarity index 94% rename from airflow/providers/docker/hooks/docker.py rename to airflow/providers/docker/hooks/airflow_docker.py index fdd34e7a593f2..1b5a6907ff103 100644 --- a/airflow/providers/docker/hooks/docker.py +++ b/airflow/providers/docker/hooks/airflow_docker.py @@ -60,7 +60,7 @@ def __init__(self, self.__username = conn.login self.__password = conn.password self.__email = extra_options.get('email') - self.__reauth = False if extra_options.get('reauth') == 'no' else True + self.__reauth = not extra_options.get('reauth') == 'no' def get_conn(self): client = APIClient( @@ -83,5 +83,5 @@ def __login(self, client): ) self.log.debug('Login successful') except APIError as docker_error: - self.log.error('Docker registry login failed: %s', str(docker_error)) - raise AirflowException('Docker registry login failed: %s', str(docker_error)) + self.log.error('Docker registry login failed: %s', docker_error) + raise AirflowException('Docker registry login failed: %s'.format(docker_error)) diff --git a/airflow/providers/docker/operators/__init__.py b/airflow/providers/docker/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/docker/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/docker/operators/docker.py b/airflow/providers/docker/operators/docker_operator.py similarity index 99% rename from airflow/providers/docker/operators/docker.py rename to airflow/providers/docker/operators/docker_operator.py index 2216d925ed42d..4dff3e8011cb4 100644 --- a/airflow/providers/docker/operators/docker.py +++ b/airflow/providers/docker/operators/docker_operator.py @@ -27,7 +27,7 @@ from airflow.exceptions import AirflowException from airflow.models import BaseOperator -from airflow.providers.docker.hooks.docker import DockerHook +from airflow.providers.docker.hooks.airflow_docker import DockerHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/docker/operators/docker_swarm.py b/airflow/providers/docker/operators/docker_swarm.py index d13b210f5caa3..35d229a74c675 100644 --- a/airflow/providers/docker/operators/docker_swarm.py +++ b/airflow/providers/docker/operators/docker_swarm.py @@ -19,7 +19,7 @@ from docker import types from airflow.exceptions import AirflowException -from airflow.providers.docker.operators.docker import DockerOperator +from airflow.providers.docker.operators.docker_operator import DockerOperator from airflow.utils.decorators import apply_defaults from airflow.utils.strings import get_random_string diff --git a/airflow/providers/email/__init__.py b/airflow/providers/email/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/email/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/email/operators/__init__.py b/airflow/providers/email/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/email/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/email/operators/email.py b/airflow/providers/email/operators/email.py index 10c9ba5c4c04e..464c362167082 100644 --- a/airflow/providers/email/operators/email.py +++ b/airflow/providers/email/operators/email.py @@ -19,7 +19,7 @@ from airflow.models import BaseOperator from airflow.utils.decorators import apply_defaults -from airflow.utils.email import send_email +from airflow.utils.email_utils import send_email class EmailOperator(BaseOperator): @@ -63,11 +63,11 @@ def __init__( mime_charset: str = 'utf-8', *args, **kwargs) -> None: super().__init__(*args, **kwargs) - self.to = to + self.to = to # pylint: disable=invalid-name self.subject = subject self.html_content = html_content self.files = files or [] - self.cc = cc + self.cc = cc # pylint: disable=invalid-name self.bcc = bcc self.mime_subtype = mime_subtype self.mime_charset = mime_charset diff --git a/airflow/providers/ftp/__init__.py b/airflow/providers/ftp/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ftp/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/ftp/hooks/__init__.py b/airflow/providers/ftp/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ftp/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/ftp/sensors/__init__.py b/airflow/providers/ftp/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ftp/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/google/__init__.py b/airflow/providers/google/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/__init__.py b/airflow/providers/google/cloud/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/cloud/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/example_dags/__init__.py b/airflow/providers/google/cloud/example_dags/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/cloud/example_dags/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/hooks/__init__.py b/airflow/providers/google/cloud/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/cloud/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/operators/__init__.py b/airflow/providers/google/cloud/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/cloud/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/operators/cassandra_to_gcs.py b/airflow/providers/google/cloud/operators/cassandra_to_gcs.py index 5c20cb7f38abd..6ee7a47e69cdd 100644 --- a/airflow/providers/google/cloud/operators/cassandra_to_gcs.py +++ b/airflow/providers/google/cloud/operators/cassandra_to_gcs.py @@ -33,7 +33,7 @@ from airflow.exceptions import AirflowException from airflow.models import BaseOperator -from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook +from airflow.providers.apache.cassandra.hooks.airflow_cassandra import CassandraHook from airflow.providers.google.cloud.hooks.gcs import GCSHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/google/cloud/sensors/__init__.py b/airflow/providers/google/cloud/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/cloud/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/cloud/utils/__init__.py b/airflow/providers/google/cloud/utils/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/google/cloud/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/google/marketing_platform/__init__.py b/airflow/providers/google/marketing_platform/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/marketing_platform/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/marketing_platform/example_dags/__init__.py b/airflow/providers/google/marketing_platform/example_dags/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/marketing_platform/example_dags/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/marketing_platform/hooks/__init__.py b/airflow/providers/google/marketing_platform/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/marketing_platform/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/marketing_platform/operators/__init__.py b/airflow/providers/google/marketing_platform/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/marketing_platform/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/marketing_platform/sensors/__init__.py b/airflow/providers/google/marketing_platform/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/google/marketing_platform/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/google/suite/__init__.py b/airflow/providers/google/suite/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/google/suite/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/google/suite/example_dags/__init__.py b/airflow/providers/google/suite/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/google/suite/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/google/suite/hooks/__init__.py b/airflow/providers/google/suite/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/google/suite/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/google/suite/operators/__init__.py b/airflow/providers/google/suite/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/google/suite/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/grpc/__init__.py b/airflow/providers/grpc/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/grpc/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/grpc/hooks/__init__.py b/airflow/providers/grpc/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/grpc/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/grpc/hooks/grpc.py b/airflow/providers/grpc/hooks/airflow_grpc.py similarity index 100% rename from airflow/providers/grpc/hooks/grpc.py rename to airflow/providers/grpc/hooks/airflow_grpc.py diff --git a/airflow/providers/grpc/operators/__init__.py b/airflow/providers/grpc/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/grpc/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/grpc/operators/grpc.py b/airflow/providers/grpc/operators/airflow_grpc.py similarity index 98% rename from airflow/providers/grpc/operators/grpc.py rename to airflow/providers/grpc/operators/airflow_grpc.py index ad6374e4d4307..2150a2af6378b 100644 --- a/airflow/providers/grpc/operators/grpc.py +++ b/airflow/providers/grpc/operators/airflow_grpc.py @@ -17,7 +17,7 @@ # under the License. from airflow.models import BaseOperator -from airflow.providers.grpc.hooks.grpc import GrpcHook +from airflow.providers.grpc.hooks.airflow_grpc import GrpcHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/http/__init__.py b/airflow/providers/http/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/http/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/http/example_dags/__init__.py b/airflow/providers/http/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/http/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/http/hooks/__init__.py b/airflow/providers/http/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/http/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/http/operators/__init__.py b/airflow/providers/http/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/http/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/http/sensors/__init__.py b/airflow/providers/http/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/http/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/http/sensors/http.py b/airflow/providers/http/sensors/http.py index 89eef47239712..5ed2a590b8c08 100644 --- a/airflow/providers/http/sensors/http.py +++ b/airflow/providers/http/sensors/http.py @@ -1,3 +1,5 @@ +# pylint: disable=unused-import +# Note that unused import here is to get rid of namedtuple unused-import which is raised erroneously # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/airflow/providers/imap/__init__.py b/airflow/providers/imap/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/imap/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/imap/hooks/__init__.py b/airflow/providers/imap/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/imap/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/imap/sensors/__init__.py b/airflow/providers/imap/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/imap/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jdbc/__init__.py b/airflow/providers/jdbc/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jdbc/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jdbc/hooks/__init__.py b/airflow/providers/jdbc/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jdbc/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jdbc/operators/__init__.py b/airflow/providers/jdbc/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jdbc/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jenkins/__init__.py b/airflow/providers/jenkins/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jenkins/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jenkins/example_dags/__init__.py b/airflow/providers/jenkins/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jenkins/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jenkins/hooks/__init__.py b/airflow/providers/jenkins/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jenkins/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jenkins/operators/__init__.py b/airflow/providers/jenkins/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/jenkins/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/jira/__init__.py b/airflow/providers/jira/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/jira/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/jira/hooks/__init__.py b/airflow/providers/jira/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/jira/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/jira/hooks/jira.py b/airflow/providers/jira/hooks/airflow_jira.py similarity index 100% rename from airflow/providers/jira/hooks/jira.py rename to airflow/providers/jira/hooks/airflow_jira.py diff --git a/airflow/providers/jira/operators/__init__.py b/airflow/providers/jira/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/jira/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/jira/operators/jira.py b/airflow/providers/jira/operators/jira.py index 07775af9e45f3..3e97be4001fb1 100644 --- a/airflow/providers/jira/operators/jira.py +++ b/airflow/providers/jira/operators/jira.py @@ -19,7 +19,7 @@ from airflow.exceptions import AirflowException from airflow.models import BaseOperator -from airflow.providers.jira.hooks.jira import JIRAError, JiraHook +from airflow.providers.jira.hooks.airflow_jira import JIRAError, JiraHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/jira/sensors/__init__.py b/airflow/providers/jira/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/jira/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/jira/sensors/jira.py b/airflow/providers/jira/sensors/airflow_jira.py similarity index 100% rename from airflow/providers/jira/sensors/jira.py rename to airflow/providers/jira/sensors/airflow_jira.py diff --git a/airflow/providers/microsoft/__init__.py b/airflow/providers/microsoft/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/azure/__init__.py b/airflow/providers/microsoft/azure/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/azure/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/azure/example_dags/__init__.py b/airflow/providers/microsoft/azure/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/azure/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/azure/hooks/__init__.py b/airflow/providers/microsoft/azure/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/azure/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/azure/operators/__init__.py b/airflow/providers/microsoft/azure/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/azure/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/azure/sensors/__init__.py b/airflow/providers/microsoft/azure/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/azure/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/mssql/__init__.py b/airflow/providers/microsoft/mssql/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/mssql/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/mssql/hooks/__init__.py b/airflow/providers/microsoft/mssql/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/mssql/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/mssql/operators/__init__.py b/airflow/providers/microsoft/mssql/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/mssql/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/winrm/__init__.py b/airflow/providers/microsoft/winrm/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/winrm/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/winrm/example_dags/__init__.py b/airflow/providers/microsoft/winrm/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/winrm/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/winrm/example_dags/example_winrm.py b/airflow/providers/microsoft/winrm/example_dags/example_winrm.py index 6c3670fa595dc..8e46d389e21a0 100644 --- a/airflow/providers/microsoft/winrm/example_dags/example_winrm.py +++ b/airflow/providers/microsoft/winrm/example_dags/example_winrm.py @@ -32,8 +32,8 @@ from airflow.models import DAG from airflow.operators.dummy_operator import DummyOperator -from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook -from airflow.providers.microsoft.winrm.operators.winrm import WinRMOperator +from airflow.providers.microsoft.winrm.hooks.airflow_winrm import WinRMHook +from airflow.providers.microsoft.winrm.operators.airflow_winrm import WinRMOperator from airflow.utils.dates import days_ago default_args = { diff --git a/airflow/providers/microsoft/winrm/hooks/__init__.py b/airflow/providers/microsoft/winrm/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/winrm/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/winrm/hooks/winrm.py b/airflow/providers/microsoft/winrm/hooks/airflow_winrm.py similarity index 100% rename from airflow/providers/microsoft/winrm/hooks/winrm.py rename to airflow/providers/microsoft/winrm/hooks/airflow_winrm.py diff --git a/airflow/providers/microsoft/winrm/operators/__init__.py b/airflow/providers/microsoft/winrm/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/microsoft/winrm/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/microsoft/winrm/operators/winrm.py b/airflow/providers/microsoft/winrm/operators/airflow_winrm.py similarity index 93% rename from airflow/providers/microsoft/winrm/operators/winrm.py rename to airflow/providers/microsoft/winrm/operators/airflow_winrm.py index c8f6631dfd1f9..e4794a98d793a 100644 --- a/airflow/providers/microsoft/winrm/operators/winrm.py +++ b/airflow/providers/microsoft/winrm/operators/airflow_winrm.py @@ -24,7 +24,7 @@ from airflow.configuration import conf from airflow.exceptions import AirflowException from airflow.models import BaseOperator -from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook +from airflow.providers.microsoft.winrm.hooks.airflow_winrm import WinRMHook from airflow.utils.decorators import apply_defaults # Hide the following error message in urllib3 when making WinRM connections: @@ -38,7 +38,7 @@ class WinRMOperator(BaseOperator): WinRMOperator to execute commands on given remote host using the winrm_hook. :param winrm_hook: predefined ssh_hook to use for remote execution - :type winrm_hook: airflow.providers.microsoft.winrm.hooks.winrm.WinRMHook + :type winrm_hook: airflow.providers.microsoft.winrm.hooks.airflow_winrm.WinRMHook :param ssh_conn_id: connection id from airflow Connections :type ssh_conn_id: str :param remote_host: remote host to connect @@ -82,7 +82,7 @@ def execute(self, context): winrm_client = self.winrm_hook.get_conn() - try: + try: # pylint: disable=too-many-nested-blocks self.log.info("Running command: '%s'...", self.command) command_id = self.winrm_hook.winrm_protocol.run_command( winrm_client, @@ -96,7 +96,8 @@ def execute(self, context): while not command_done: try: stdout, stderr, return_code, command_done = \ - self.winrm_hook.winrm_protocol._raw_get_command_output( + self.winrm_hook.winrm_protocol. \ + _raw_get_command_output( # pylint: disable=protected-access # noqa winrm_client, command_id ) diff --git a/airflow/providers/mongo/__init__.py b/airflow/providers/mongo/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mongo/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/mongo/hooks/__init__.py b/airflow/providers/mongo/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mongo/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/mongo/sensors/__init__.py b/airflow/providers/mongo/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mongo/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/mysql/__init__.py b/airflow/providers/mysql/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mysql/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/mysql/hooks/__init__.py b/airflow/providers/mysql/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mysql/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/mysql/operators/__init__.py b/airflow/providers/mysql/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/mysql/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/odbc/__init__.py b/airflow/providers/odbc/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/odbc/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/odbc/hooks/__init__.py b/airflow/providers/odbc/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/odbc/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/openfass/__init__.py b/airflow/providers/openfass/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/openfass/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/openfass/hooks/__init__.py b/airflow/providers/openfass/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/openfass/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/opsgenie/__init__.py b/airflow/providers/opsgenie/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/opsgenie/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/opsgenie/hooks/__init__.py b/airflow/providers/opsgenie/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/opsgenie/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/opsgenie/operators/__init__.py b/airflow/providers/opsgenie/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/opsgenie/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/oracle/__init__.py b/airflow/providers/oracle/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/oracle/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/oracle/hooks/__init__.py b/airflow/providers/oracle/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/oracle/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/oracle/operators/__init__.py b/airflow/providers/oracle/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/oracle/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/pagerduty/__init__.py b/airflow/providers/pagerduty/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/pagerduty/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/pagerduty/hooks/__init__.py b/airflow/providers/pagerduty/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/pagerduty/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/papermill/__init__.py b/airflow/providers/papermill/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/papermill/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/papermill/example_dags/__init__.py b/airflow/providers/papermill/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/papermill/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/papermill/operators/__init__.py b/airflow/providers/papermill/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/papermill/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/postgres/__init__.py b/airflow/providers/postgres/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/postgres/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/postgres/hooks/__init__.py b/airflow/providers/postgres/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/postgres/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/postgres/operators/__init__.py b/airflow/providers/postgres/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/postgres/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/presto/__init__.py b/airflow/providers/presto/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/presto/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/presto/hooks/__init__.py b/airflow/providers/presto/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/presto/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/presto/operators/__init__.py b/airflow/providers/presto/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/presto/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/qubole/__init__.py b/airflow/providers/qubole/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/qubole/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/qubole/example_dags/__init__.py b/airflow/providers/qubole/example_dags/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/qubole/example_dags/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/qubole/hooks/__init__.py b/airflow/providers/qubole/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/qubole/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/qubole/operators/__init__.py b/airflow/providers/qubole/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/qubole/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/qubole/sensors/__init__.py b/airflow/providers/qubole/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/qubole/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/redis/__init__.py b/airflow/providers/redis/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/redis/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/redis/hooks/__init__.py b/airflow/providers/redis/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/redis/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/redis/hooks/redis.py b/airflow/providers/redis/hooks/airflow_redis.py similarity index 100% rename from airflow/providers/redis/hooks/redis.py rename to airflow/providers/redis/hooks/airflow_redis.py diff --git a/airflow/providers/redis/operators/__init__.py b/airflow/providers/redis/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/redis/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/redis/operators/redis_publish.py b/airflow/providers/redis/operators/redis_publish.py index 6734b42b254ff..cb4bda40bfadd 100644 --- a/airflow/providers/redis/operators/redis_publish.py +++ b/airflow/providers/redis/operators/redis_publish.py @@ -17,7 +17,7 @@ # under the License. from airflow.models import BaseOperator -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/redis/sensors/__init__.py b/airflow/providers/redis/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/redis/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/redis/sensors/redis_key.py b/airflow/providers/redis/sensors/redis_key.py index e53be94649d5e..145a1a578569d 100644 --- a/airflow/providers/redis/sensors/redis_key.py +++ b/airflow/providers/redis/sensors/redis_key.py @@ -15,7 +15,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.sensors.base_sensor_operator import BaseSensorOperator from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/redis/sensors/redis_pub_sub.py b/airflow/providers/redis/sensors/redis_pub_sub.py index eb489399173dc..7d35eb7b03f03 100644 --- a/airflow/providers/redis/sensors/redis_pub_sub.py +++ b/airflow/providers/redis/sensors/redis_pub_sub.py @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.sensors.base_sensor_operator import BaseSensorOperator from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/salesforce/__init__.py b/airflow/providers/salesforce/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/salesforce/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/salesforce/hooks/__init__.py b/airflow/providers/salesforce/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/salesforce/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/samba/__init__.py b/airflow/providers/samba/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/samba/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/samba/hooks/__init__.py b/airflow/providers/samba/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/samba/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/segment/__init__.py b/airflow/providers/segment/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/segment/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/segment/hooks/__init__.py b/airflow/providers/segment/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/segment/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/segment/operators/__init__.py b/airflow/providers/segment/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/segment/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/sftp/__init__.py b/airflow/providers/sftp/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/sftp/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/sftp/hooks/__init__.py b/airflow/providers/sftp/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/sftp/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/sftp/operators/__init__.py b/airflow/providers/sftp/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/sftp/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/sftp/sensors/__init__.py b/airflow/providers/sftp/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/sftp/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/slack/__init__.py b/airflow/providers/slack/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/slack/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/slack/hooks/__init__.py b/airflow/providers/slack/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/slack/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/slack/operators/__init__.py b/airflow/providers/slack/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/slack/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/snowflake/__init__.py b/airflow/providers/snowflake/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/snowflake/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/snowflake/hooks/__init__.py b/airflow/providers/snowflake/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/snowflake/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/snowflake/hooks/snowflake.py b/airflow/providers/snowflake/hooks/airflow_snowflake.py similarity index 99% rename from airflow/providers/snowflake/hooks/snowflake.py rename to airflow/providers/snowflake/hooks/airflow_snowflake.py index 2bef46b923b0c..9ac4536c4280c 100644 --- a/airflow/providers/snowflake/hooks/snowflake.py +++ b/airflow/providers/snowflake/hooks/airflow_snowflake.py @@ -29,7 +29,7 @@ class SnowflakeHook(DbApiHook): Interact with Snowflake. get_sqlalchemy_engine() depends on snowflake-sqlalchemy """ - default_conn_name = 'snowflake_default' + conn_name_attr = 'snowflake_default' supports_autocommit = True def __init__(self, *args, **kwargs): diff --git a/airflow/providers/snowflake/operators/__init__.py b/airflow/providers/snowflake/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/airflow/providers/snowflake/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/providers/snowflake/operators/s3_to_snowflake.py b/airflow/providers/snowflake/operators/s3_to_snowflake.py index 973f9ba31e15c..d2892b857976e 100644 --- a/airflow/providers/snowflake/operators/s3_to_snowflake.py +++ b/airflow/providers/snowflake/operators/s3_to_snowflake.py @@ -21,7 +21,7 @@ """ from airflow.models import BaseOperator -from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook +from airflow.providers.snowflake.hooks.airflow_snowflake import SnowflakeHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/snowflake/operators/snowflake.py b/airflow/providers/snowflake/operators/snowflake.py index 01d513109ce89..efff2523daa7c 100644 --- a/airflow/providers/snowflake/operators/snowflake.py +++ b/airflow/providers/snowflake/operators/snowflake.py @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. from airflow.models import BaseOperator -from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook +from airflow.providers.snowflake.hooks.airflow_snowflake import SnowflakeHook from airflow.utils.decorators import apply_defaults diff --git a/airflow/providers/sqlite/__init__.py b/airflow/providers/sqlite/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/sqlite/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/sqlite/hooks/__init__.py b/airflow/providers/sqlite/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/sqlite/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/sqlite/operators/__init__.py b/airflow/providers/sqlite/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/sqlite/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/ssh/__init__.py b/airflow/providers/ssh/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ssh/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/ssh/hooks/__init__.py b/airflow/providers/ssh/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ssh/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/ssh/operators/__init__.py b/airflow/providers/ssh/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/ssh/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/vertica/__init__.py b/airflow/providers/vertica/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/vertica/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/vertica/hooks/__init__.py b/airflow/providers/vertica/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/vertica/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/vertica/operators/__init__.py b/airflow/providers/vertica/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/vertica/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/zendesk/__init__.py b/airflow/providers/zendesk/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/zendesk/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/providers/zendesk/hooks/__init__.py b/airflow/providers/zendesk/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/providers/zendesk/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/security/__init__.py b/airflow/security/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/security/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/security/kerberos.py b/airflow/security/kerberos_security.py similarity index 100% rename from airflow/security/kerberos.py rename to airflow/security/kerberos_security.py diff --git a/airflow/settings.py b/airflow/settings.py index 647c9a9188500..62dd1720f57d5 100644 --- a/airflow/settings.py +++ b/airflow/settings.py @@ -34,7 +34,7 @@ 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 -from airflow.utils.sqlalchemy import setup_event_handlers +from airflow.utils.sqlalchemy_utils import setup_event_handlers log = logging.getLogger(__name__) diff --git a/airflow/task/__init__.py b/airflow/task/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/task/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/ti_deps/__init__.py b/airflow/ti_deps/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/ti_deps/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/utils/__init__.py b/airflow/utils/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/utils/db.py b/airflow/utils/db.py index 29e521be1ce8c..64cd563f65267 100644 --- a/airflow/utils/db.py +++ b/airflow/utils/db.py @@ -18,12 +18,19 @@ import logging import os -from airflow import models, settings +from sqlalchemy import Table + +from airflow import settings from airflow.configuration import conf +# noinspection PyUnresolvedReferences from airflow.jobs.base_job import BaseJob # noqa: F401 # pylint: disable=unused-import -from airflow.models import Connection -from airflow.models.pool import Pool +# noinspection PyUnresolvedReferences +from airflow.models import ( # noqa: F401 # pylint: disable=unused-import + DAG, XCOM_RETURN_KEY, BaseOperator, BaseOperatorLink, Connection, DagBag, DagModel, DagPickle, DagRun, + DagTag, Log, Pool, SkipMixin, SlaMiss, TaskFail, TaskInstance, TaskReschedule, Variable, XCom, +) # We need to add this model manually to get reset working well +# noinspection PyUnresolvedReferences from airflow.models.serialized_dag import SerializedDagModel # noqa: F401 # pylint: disable=unused-import from airflow.utils.session import create_session, provide_session # noqa # pylint: disable=unused-import @@ -447,12 +454,12 @@ def initdb(): create_default_connections() - dagbag = models.DagBag() + dagbag = DagBag() # Save individual DAGs in the ORM for dag in dagbag.dags.values(): dag.sync_to_db() # Deactivate the unknown ones - models.DAG.deactivate_unknown_dags(dagbag.dags.keys()) + DAG.deactivate_unknown_dags(dagbag.dags.keys()) from flask_appbuilder.models.sqla import Base Base.metadata.create_all(settings.engine) # pylint: disable=no-member @@ -482,24 +489,54 @@ def resetdb(): """ Clear out the database """ - # alembic adds significant import time, so we import it lazily - # noinspection PyUnresolvedReferences - from alembic.migration import MigrationContext log.info("Dropping tables that exist") connection = settings.engine.connect() - models.base.Base.metadata.drop_all(connection) - migartion_ctx = MigrationContext.configure(connection) - version = migartion_ctx._version # pylint: disable=protected-access + + drop_airflow_models(connection) + drop_flask_models(connection) + + initdb() + + +def drop_airflow_models(connection): + """ + Drops all airflow models. + @param connection: + @return: None + """ + from airflow.models.base import Base + # Drop connection and chart - those tables have been deleted and in case you + # run resetdb on schema with chart or users table will fail + chart = Table('chart', Base.metadata) + chart.drop(settings.engine, checkfirst=True) + user = Table('user', Base.metadata) + user.drop(settings.engine, checkfirst=True) + users = Table('users', Base.metadata) + users.drop(settings.engine, checkfirst=True) + dag_stats = Table('dag_stats', Base.metadata) + dag_stats.drop(settings.engine, checkfirst=True) + Base.metadata.drop_all(connection) + # alembic adds significant import time, so we import it lazily + # noinspection PyUnresolvedReferences + from alembic.migration import MigrationContext + migration_ctx = MigrationContext.configure(connection) + # noinspection PyProtectedMember + version = migration_ctx._version # pylint: disable=protected-access if version.exists(connection): version.drop(connection) + +def drop_flask_models(connection): + """ + Drops all Flask models. + @param connection: + @return: + """ from flask_appbuilder.models.sqla import Base Base.metadata.drop_all(connection) # pylint: disable=no-member - initdb() - @provide_session def check(session=None): diff --git a/airflow/utils/email.py b/airflow/utils/email_utils.py similarity index 100% rename from airflow/utils/email.py rename to airflow/utils/email_utils.py diff --git a/airflow/utils/file.py b/airflow/utils/file.py index d030699a4788a..edfab30576cd9 100644 --- a/airflow/utils/file.py +++ b/airflow/utils/file.py @@ -126,7 +126,9 @@ def list_py_file_paths(directory: str, find_dag_file_paths(file_paths, files, patterns, root, safe_mode) if include_examples: from airflow import example_dags - example_dag_folder = example_dags.__path__[0] # type: ignore + # noinspection PyProtectedMember + example_dag_folder = \ + example_dags.__path__._path[0] # type: ignore # pylint: disable=no-member,protected-access file_paths.extend(list_py_file_paths(example_dag_folder, safe_mode, False)) return file_paths diff --git a/airflow/utils/json.py b/airflow/utils/json_encoder.py similarity index 100% rename from airflow/utils/json.py rename to airflow/utils/json_encoder.py diff --git a/airflow/utils/log/__init__.py b/airflow/utils/log/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/utils/log/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/utils/sqlalchemy.py b/airflow/utils/sqlalchemy_utils.py similarity index 100% rename from airflow/utils/sqlalchemy.py rename to airflow/utils/sqlalchemy_utils.py diff --git a/airflow/www/__init__.py b/airflow/www/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/airflow/www/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/www/api/__init__.py b/airflow/www/api/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/airflow/www/api/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/airflow/www/api/experimental/__init__.py b/airflow/www/api/experimental/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/airflow/www/api/experimental/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/airflow/www/app.py b/airflow/www/app.py index 944cb130c270e..1994675600f29 100644 --- a/airflow/www/app.py +++ b/airflow/www/app.py @@ -35,7 +35,7 @@ from airflow import settings, version from airflow.configuration import conf from airflow.logging_config import configure_logging -from airflow.utils.json import AirflowJsonEncoder +from airflow.utils.json_encoder import AirflowJsonEncoder from airflow.www.static_config import configure_manifest_files app = None # type: Any diff --git a/airflow/www/utils.py b/airflow/www/utils.py index a3bf6659a9f74..c2e5a4385ce42 100644 --- a/airflow/www/utils.py +++ b/airflow/www/utils.py @@ -39,7 +39,7 @@ from airflow.models.baseoperator import BaseOperator from airflow.operators.subdag_operator import SubDagOperator from airflow.utils import timezone -from airflow.utils.json import AirflowJsonEncoder +from airflow.utils.json_encoder import AirflowJsonEncoder from airflow.utils.state import State DEFAULT_SENSITIVE_VARIABLE_FIELDS = ( @@ -469,7 +469,7 @@ def clean_column_names(): clean_column_names() def is_utcdatetime(self, col_name): - from airflow.utils.sqlalchemy import UtcDateTime + from airflow.utils.sqlalchemy_utils import UtcDateTime if col_name in self.list_columns: obj = self.list_columns[col_name].type diff --git a/docs/autoapi_templates/index.rst b/docs/autoapi_templates/index.rst index 9f0e847be7d9a..44dd9c52d3c61 100644 --- a/docs/autoapi_templates/index.rst +++ b/docs/autoapi_templates/index.rst @@ -62,122 +62,376 @@ All operators are in the following packages: :glob: :maxdepth: 1 - airflow/operators/index + airflow/providers/amazon/aws/operators/athena/index - airflow/sensors/index + airflow/providers/amazon/aws/operators/batch/index - airflow/providers/amazon/aws/operators/index + airflow/providers/amazon/aws/operators/cloud_formation/index - airflow/providers/amazon/aws/sensors/index + airflow/providers/amazon/aws/operators/datasync/index - airflow/providers/apache/cassandra/sensors/index + airflow/providers/amazon/aws/operators/dynamodb_to_s3/index - airflow/providers/apache/druid/operators/index + airflow/providers/amazon/aws/operators/ecs/index - airflow/providers/apache/hdfs/sensors/index + airflow/providers/amazon/aws/operators/emr_add_steps/index - airflow/providers/apache/hive/operators/index + airflow/providers/amazon/aws/operators/emr_create_job_flow/index - airflow/providers/apache/hive/sensors/index + airflow/providers/amazon/aws/operators/emr_modify_cluster/index - airflow/providers/apache/pig/operators/index + airflow/providers/amazon/aws/operators/emr_terminate_job_flow/index - airflow/providers/apache/spark/operators/index + airflow/providers/amazon/aws/operators/gcs_to_s3/index - airflow/providers/apache/sqoop/operators/index + airflow/providers/amazon/aws/operators/google_api_to_s3_transfer/index - airflow/providers/celery/sensors/index + airflow/providers/amazon/aws/operators/hive_to_dynamodb/index - airflow/providers/cncf/kubernetes/operators/index + airflow/providers/amazon/aws/operators/imap_attachment_to_s3/index - airflow/providers/databricks/operators/index + airflow/providers/amazon/aws/operators/mongo_to_s3/index - airflow/providers/datadog/sensors/index + airflow/providers/amazon/aws/operators/redshift_to_s3/index - airflow/providers/dingding/operators/index + airflow/providers/amazon/aws/operators/s3_copy_object/index - airflow/providers/discord/operators/index + airflow/providers/amazon/aws/operators/s3_delete_objects/index - airflow/providers/docker/operators/index + airflow/providers/amazon/aws/operators/s3_file_transform/index - airflow/providers/email/operators/index + airflow/providers/amazon/aws/operators/s3_list/index - airflow/providers/ftp/sensors/index + airflow/providers/amazon/aws/operators/s3_to_redshift/index - airflow/providers/google/cloud/operators/index + airflow/providers/amazon/aws/operators/s3_to_sftp/index - airflow/providers/google/cloud/sensors/index + airflow/providers/amazon/aws/operators/sagemaker_base/index - airflow/providers/google/marketing_platform/operators/index + airflow/providers/amazon/aws/operators/sagemaker_endpoint/index - airflow/providers/google/marketing_platform/sensors/index + airflow/providers/amazon/aws/operators/sagemaker_endpoint_config/index - airflow/providers/google/suite/operators/index + airflow/providers/amazon/aws/operators/sagemaker_model/index - airflow/providers/grpc/operators/index + airflow/providers/amazon/aws/operators/sagemaker_training/index - airflow/providers/http/operators/index + airflow/providers/amazon/aws/operators/sagemaker_transform/index - airflow/providers/http/sensors/index + airflow/providers/amazon/aws/operators/sagemaker_tuning/index - airflow/providers/imap/sensors/index + airflow/providers/amazon/aws/operators/sftp_to_s3/index - airflow/providers/jdbc/operators/index + airflow/providers/amazon/aws/operators/sns/index - airflow/providers/jenkins/operators/index + airflow/providers/amazon/aws/operators/sqs/index - airflow/providers/jira/operators/index + airflow/providers/apache/druid/operators/druid/index - airflow/providers/jira/sensors/index + airflow/providers/apache/druid/operators/druid_check/index - airflow/providers/microsoft/azure/operators/index + airflow/providers/apache/druid/operators/hive_to_druid/index - airflow/providers/microsoft/azure/sensors/index + airflow/providers/apache/hive/operators/hive/index - airflow/providers/microsoft/mssql/operators/index + airflow/providers/apache/hive/operators/hive_stats/index - airflow/providers/microsoft/winrm/operators/index + airflow/providers/apache/hive/operators/hive_to_mysql/index - airflow/providers/mongo/sensors/index + airflow/providers/apache/hive/operators/hive_to_samba/index - airflow/providers/mysql/operators/index + airflow/providers/apache/hive/operators/mssql_to_hive/index - airflow/providers/opsgenie/operators/index + airflow/providers/apache/hive/operators/mysql_to_hive/index - airflow/providers/oracle/operators/index + airflow/providers/apache/hive/operators/s3_to_hive/index - airflow/providers/papermill/operators/index + airflow/providers/apache/hive/operators/vertica_to_hive/index - airflow/providers/postgres/operators/index + airflow/providers/apache/pig/operators/pig/index - airflow/providers/presto/operators/index + airflow/providers/apache/spark/operators/spark_jdbc/index - airflow/providers/qubole/operators/index + airflow/providers/apache/spark/operators/spark_sql/index - airflow/providers/qubole/sensors/index + airflow/providers/apache/spark/operators/spark_submit/index - airflow/providers/redis/operators/index + airflow/providers/apache/sqoop/operators/sqoop/index - airflow/providers/redis/sensors/index + airflow/providers/cncf/kubernetes/operators/kubernetes_pod/index - airflow/providers/segment/operators/index + airflow/providers/databricks/operators/databricks/index - airflow/providers/sftp/operators/index + airflow/providers/dingding/operators/dingding/index - airflow/providers/sftp/sensors/index + airflow/providers/discord/operators/discord_webhook/index - airflow/providers/slack/operators/index + airflow/providers/docker/operators/docker_operator/index - airflow/providers/snowflake/operators/index + airflow/providers/docker/operators/docker_swarm/index - airflow/providers/sqlite/operators/index + airflow/providers/email/operators/email/index - airflow/providers/ssh/operators/index + airflow/providers/google/cloud/operators/adls_to_gcs/index + + airflow/providers/google/cloud/operators/automl/index + + airflow/providers/google/cloud/operators/bigquery/index + + airflow/providers/google/cloud/operators/bigquery_dts/index + + airflow/providers/google/cloud/operators/bigquery_to_bigquery/index + + airflow/providers/google/cloud/operators/bigquery_to_gcs/index + + airflow/providers/google/cloud/operators/bigquery_to_mysql/index + + airflow/providers/google/cloud/operators/bigtable/index + + airflow/providers/google/cloud/operators/cassandra_to_gcs/index + + airflow/providers/google/cloud/operators/cloud_build/index + + airflow/providers/google/cloud/operators/cloud_memorystore/index + + airflow/providers/google/cloud/operators/cloud_sql/index + + airflow/providers/google/cloud/operators/cloud_storage_transfer_service/index + + airflow/providers/google/cloud/operators/compute/index + + airflow/providers/google/cloud/operators/dataflow/index + + airflow/providers/google/cloud/operators/dataproc/index + + airflow/providers/google/cloud/operators/datastore/index + + airflow/providers/google/cloud/operators/dlp/index + + airflow/providers/google/cloud/operators/functions/index + + airflow/providers/google/cloud/operators/gcs/index + + airflow/providers/google/cloud/operators/gcs_to_bigquery/index + + airflow/providers/google/cloud/operators/gcs_to_gcs/index + + airflow/providers/google/cloud/operators/gcs_to_sftp/index + + airflow/providers/google/cloud/operators/kubernetes_engine/index + + airflow/providers/google/cloud/operators/local_to_gcs/index + + airflow/providers/google/cloud/operators/mlengine/index + + airflow/providers/google/cloud/operators/mssql_to_gcs/index + + airflow/providers/google/cloud/operators/mysql_to_gcs/index + + airflow/providers/google/cloud/operators/natural_language/index + + airflow/providers/google/cloud/operators/postgres_to_gcs/index + + airflow/providers/google/cloud/operators/pubsub/index + + airflow/providers/google/cloud/operators/s3_to_gcs/index + + airflow/providers/google/cloud/operators/sftp_to_gcs/index + + airflow/providers/google/cloud/operators/spanner/index + + airflow/providers/google/cloud/operators/speech_to_text/index + + airflow/providers/google/cloud/operators/sql_to_gcs/index + + airflow/providers/google/cloud/operators/tasks/index + + airflow/providers/google/cloud/operators/text_to_speech/index + + airflow/providers/google/cloud/operators/translate/index + + airflow/providers/google/cloud/operators/translate_speech/index + + airflow/providers/google/cloud/operators/video_intelligence/index + + airflow/providers/google/cloud/operators/vision/index + + airflow/providers/google/marketing_platform/operators/campaign_manager/index + + airflow/providers/google/marketing_platform/operators/display_video/index + + airflow/providers/google/marketing_platform/operators/search_ads/index + + airflow/providers/google/suite/operators/gcs_to_gdrive_operator/index + + airflow/providers/grpc/operators/airflow_grpc/index + + airflow/providers/http/operators/http/index + + airflow/providers/jdbc/operators/jdbc/index + + airflow/providers/jenkins/operators/jenkins_job_trigger/index + + airflow/providers/jira/operators/jira/index + + airflow/providers/microsoft/azure/operators/adls_list/index + + airflow/providers/microsoft/azure/operators/azure_container_instances/index + + airflow/providers/microsoft/azure/operators/azure_cosmos/index + + airflow/providers/microsoft/azure/operators/file_to_wasb/index + + airflow/providers/microsoft/azure/operators/oracle_to_azure_data_lake_transfer/index + + airflow/providers/microsoft/azure/operators/wasb_delete_blob/index + + airflow/providers/microsoft/mssql/operators/mssql/index + + airflow/providers/microsoft/winrm/operators/airflow_winrm/index + + airflow/providers/mysql/operators/mysql/index + + airflow/providers/mysql/operators/presto_to_mysql/index + + airflow/providers/mysql/operators/vertica_to_mysql/index + + airflow/providers/opsgenie/operators/opsgenie_alert/index + + airflow/providers/oracle/operators/oracle/index + + airflow/providers/oracle/operators/oracle_to_oracle_transfer/index + + airflow/providers/papermill/operators/papermill/index + + airflow/providers/postgres/operators/postgres/index + + airflow/providers/presto/operators/presto_check/index + + airflow/providers/qubole/operators/qubole/index + + airflow/providers/qubole/operators/qubole_check/index + + airflow/providers/redis/operators/redis_publish/index + + airflow/providers/segment/operators/segment_track_event/index + + airflow/providers/sftp/operators/sftp/index + + airflow/providers/slack/operators/slack/index + + airflow/providers/slack/operators/slack_webhook/index + + airflow/providers/snowflake/operators/s3_to_snowflake/index + + airflow/providers/snowflake/operators/snowflake/index + + airflow/providers/sqlite/operators/sqlite/index + + airflow/providers/ssh/operators/ssh/index + + airflow/providers/vertica/operators/vertica/index - airflow/providers/vertica/operators/index .. _pythonapi:hooks: +Sensor packages +'''''''''''''''''' +All sensors are in the following packages: + +.. toctree:: + :includehidden: + :glob: + :maxdepth: 1 + + airflow/providers/amazon/aws/sensors/athena/index + + airflow/providers/amazon/aws/sensors/cloud_formation/index + + airflow/providers/amazon/aws/sensors/emr_base/index + + airflow/providers/amazon/aws/sensors/emr_job_flow/index + + airflow/providers/amazon/aws/sensors/emr_step/index + + airflow/providers/amazon/aws/sensors/glue_catalog_partition/index + + airflow/providers/amazon/aws/sensors/redshift/index + + airflow/providers/amazon/aws/sensors/s3_key/index + + airflow/providers/amazon/aws/sensors/s3_prefix/index + + airflow/providers/amazon/aws/sensors/sagemaker_base/index + + airflow/providers/amazon/aws/sensors/sagemaker_endpoint/index + + airflow/providers/amazon/aws/sensors/sagemaker_training/index + + airflow/providers/amazon/aws/sensors/sagemaker_transform/index + + airflow/providers/amazon/aws/sensors/sagemaker_tuning/index + + airflow/providers/amazon/aws/sensors/sqs/index + + airflow/providers/apache/cassandra/sensors/record/index + + airflow/providers/apache/cassandra/sensors/table/index + + airflow/providers/apache/hdfs/sensors/hdfs/index + + airflow/providers/apache/hdfs/sensors/web_hdfs/index + + airflow/providers/apache/hive/sensors/hive_partition/index + + airflow/providers/apache/hive/sensors/metastore_partition/index + + airflow/providers/apache/hive/sensors/named_hive_partition/index + + airflow/providers/celery/sensors/celery_queue/index + + airflow/providers/datadog/sensors/airflow_datadog/index + + airflow/providers/ftp/sensors/ftp/index + + airflow/providers/google/cloud/sensors/bigquery/index + + airflow/providers/google/cloud/sensors/bigquery_dts/index + + airflow/providers/google/cloud/sensors/bigtable/index + + airflow/providers/google/cloud/sensors/cloud_storage_transfer_service/index + + airflow/providers/google/cloud/sensors/gcs/index + + airflow/providers/google/cloud/sensors/pubsub/index + + airflow/providers/google/marketing_platform/sensors/campaign_manager/index + + airflow/providers/google/marketing_platform/sensors/display_video/index + + airflow/providers/google/marketing_platform/sensors/search_ads/index + + airflow/providers/http/sensors/http/index + + airflow/providers/imap/sensors/imap_attachment/index + + airflow/providers/jira/sensors/airflow_jira/index + + airflow/providers/microsoft/azure/sensors/azure_cosmos/index + + airflow/providers/microsoft/azure/sensors/wasb/index + + airflow/providers/mongo/sensors/mongo/index + + airflow/providers/qubole/sensors/qubole/index + + airflow/providers/redis/sensors/redis_key/index + + airflow/providers/redis/sensors/redis_pub_sub/index + + airflow/providers/sftp/sensors/sftp/index + Hooks ----- Hooks are interfaces to external platforms and databases, implementing a common @@ -193,105 +447,221 @@ All hooks are in the following packages: :glob: :maxdepth: 1 - airflow/hooks/index + airflow/providers/amazon/aws/hooks/athena/index.rst: + + airflow/providers/amazon/aws/hooks/aws_dynamodb_hook/index + + airflow/providers/amazon/aws/hooks/aws_hook/index + + airflow/providers/amazon/aws/hooks/batch_client/index + + airflow/providers/amazon/aws/hooks/batch_waiters/index + + airflow/providers/amazon/aws/hooks/cloud_formation/index + + airflow/providers/amazon/aws/hooks/datasync/index + + airflow/providers/amazon/aws/hooks/emr/index + + airflow/providers/amazon/aws/hooks/glue_catalog/index + + airflow/providers/amazon/aws/hooks/kinesis/index + + airflow/providers/amazon/aws/hooks/lambda_function/index + + airflow/providers/amazon/aws/hooks/logs/index + + airflow/providers/amazon/aws/hooks/redshift/index + + airflow/providers/amazon/aws/hooks/s3/index + + airflow/providers/amazon/aws/hooks/sagemaker/index + + airflow/providers/amazon/aws/hooks/sns/index + + airflow/providers/amazon/aws/hooks/sqs/index + + airflow/providers/apache/cassandra/hooks/airflow_cassandra/index + + airflow/providers/apache/druid/hooks/druid/index + + airflow/providers/apache/hdfs/hooks/airflow_hdfs/index + + airflow/providers/apache/hdfs/hooks/webhdfs/index + + airflow/providers/apache/hive/hooks/hive/index + + airflow/providers/apache/pig/hooks/pig/index + + airflow/providers/apache/pinot/hooks/pinot/index + + airflow/providers/apache/spark/hooks/spark_jdbc/index + + airflow/providers/apache/spark/hooks/spark_jdbc_script/index + + airflow/providers/apache/spark/hooks/spark_sql/index + + airflow/providers/apache/spark/hooks/spark_submit/index + + airflow/providers/apache/sqoop/hooks/sqoop/index + + airflow/providers/cloudant/hooks/airflow_cloudant/index + + airflow/providers/databricks/hooks/databricks/index + + airflow/providers/datadog/hooks/datadog/index + + airflow/providers/dingding/hooks/dingding/index + + airflow/providers/discord/hooks/discord_webhook/index + + airflow/providers/docker/hooks/airflow_docker/index + + airflow/providers/ftp/hooks/ftp/index + + airflow/providers/google/cloud/hooks/automl/index + + airflow/providers/google/cloud/hooks/base/index + + airflow/providers/google/cloud/hooks/bigquery/index + + airflow/providers/google/cloud/hooks/bigquery_dts/index + + airflow/providers/google/cloud/hooks/bigtable/index + + airflow/providers/google/cloud/hooks/cloud_build/index + + airflow/providers/google/cloud/hooks/cloud_memorystore/index + + airflow/providers/google/cloud/hooks/cloud_sql/index + + airflow/providers/google/cloud/hooks/cloud_storage_transfer_service/index + + airflow/providers/google/cloud/hooks/compute/index + + airflow/providers/google/cloud/hooks/dataflow/index + + airflow/providers/google/cloud/hooks/dataproc/index + + airflow/providers/google/cloud/hooks/datastore/index + + airflow/providers/google/cloud/hooks/discovery_api/index + + airflow/providers/google/cloud/hooks/dlp/index + + airflow/providers/google/cloud/hooks/functions/index + + airflow/providers/google/cloud/hooks/gcs/index + + airflow/providers/google/cloud/hooks/kms/index + + airflow/providers/google/cloud/hooks/kubernetes_engine/index + + airflow/providers/google/cloud/hooks/mlengine/index + + airflow/providers/google/cloud/hooks/natural_language/index + + airflow/providers/google/cloud/hooks/pubsub/index + + airflow/providers/google/cloud/hooks/spanner/index - airflow/providers/amazon/aws/hooks/index + airflow/providers/google/cloud/hooks/speech_to_text/index - airflow/providers/apache/cassandra/hooks/index + airflow/providers/google/cloud/hooks/tasks/index - airflow/providers/apache/druid/hooks/index + airflow/providers/google/cloud/hooks/text_to_speech/index - airflow/providers/apache/hdfs/hooks/index + airflow/providers/google/cloud/hooks/translate/index - airflow/providers/apache/hive/hooks/index + airflow/providers/google/cloud/hooks/video_intelligence/index - airflow/providers/apache/pig/hooks/index + airflow/providers/google/cloud/hooks/vision/index - airflow/providers/apache/pinot/hooks/index + airflow/providers/google/marketing_platform/hooks/campaign_manager/index - airflow/providers/apache/spark/hooks/index + airflow/providers/google/marketing_platform/hooks/display_video/index - airflow/providers/apache/sqoop/hooks/index + airflow/providers/google/marketing_platform/hooks/search_ads/index - airflow/providers/cloudant/hooks/index + airflow/providers/google/suite/hooks/drive/index - airflow/providers/databricks/hooks/index + airflow/providers/google/suite/hooks/sheets/index - airflow/providers/datadog/hooks/index + airflow/providers/grpc/hooks/airflow_grpc/index - airflow/providers/discord/hooks/index + airflow/providers/http/hooks/http/index - airflow/providers/dingding/hooks/index + airflow/providers/imap/hooks/imap/index - airflow/providers/docker/hooks/index + airflow/providers/jdbc/hooks/jdbc/index - airflow/providers/ftp/hooks/index + airflow/providers/jenkins/hooks/jenkins/index - airflow/providers/google/cloud/hooks/index + airflow/providers/jira/hooks/airflow_jira/index - airflow/providers/google/marketing_platform/hooks/index + airflow/providers/microsoft/azure/hooks/azure_container_instance/index - airflow/providers/google/suite/hooks/index + airflow/providers/microsoft/azure/hooks/azure_container_registry/index - airflow/providers/grpc/hooks/index + airflow/providers/microsoft/azure/hooks/azure_container_volume/index - airflow/providers/http/hooks/index + airflow/providers/microsoft/azure/hooks/azure_cosmos/index - airflow/providers/imap/hooks/index + airflow/providers/microsoft/azure/hooks/azure_data_lake/index - airflow/providers/jdbc/hooks/index + airflow/providers/microsoft/azure/hooks/azure_fileshare/index - airflow/providers/jenkins/hooks/index + airflow/providers/microsoft/azure/hooks/wasb/index - airflow/providers/jira/hooks/index + airflow/providers/microsoft/mssql/hooks/mssql/index - airflow/providers/microsoft/azure/hooks/index + airflow/providers/microsoft/winrm/hooks/airflow_winrm/index - airflow/providers/microsoft/mssql/hooks/index + airflow/providers/mongo/hooks/mongo/index - airflow/providers/microsoft/winrm/hooks/index + airflow/providers/mysql/hooks/mysql/index - airflow/providers/mongo/hooks/index + airflow/providers/odbc/hooks/odbc/index - airflow/providers/mysql/hooks/index + airflow/providers/openfass/hooks/openfaas/index - airflow/providers/odbc/hooks/index + airflow/providers/opsgenie/hooks/opsgenie_alert/index - airflow/providers/openfass/hooks/index + airflow/providers/oracle/hooks/oracle/index - airflow/providers/opsgenie/hooks/index + airflow/providers/pagerduty/hooks/pagerduty/index - airflow/providers/oracle/hooks/index + airflow/providers/postgres/hooks/postgres/index - airflow/providers/pagerduty/hooks/index + airflow/providers/presto/hooks/presto/index - airflow/providers/postgres/hooks/index + airflow/providers/qubole/hooks/qubole/index - airflow/providers/presto/hooks/index + airflow/providers/qubole/hooks/qubole_check/index - airflow/providers/qubole/hooks/index + airflow/providers/redis/hooks/airflow_redis/index - airflow/providers/redis/hooks/index + airflow/providers/salesforce/hooks/salesforce/index - airflow/providers/salesforce/hooks/index + airflow/providers/samba/hooks/samba/index - airflow/providers/samba/hooks/index + airflow/providers/segment/hooks/segment/index - airflow/providers/segment/hooks/index + airflow/providers/sftp/hooks/sftp/index - airflow/providers/sftp/hooks/index + airflow/providers/slack/hooks/slack/index - airflow/providers/slack/hooks/index + airflow/providers/slack/hooks/slack_webhook/index - airflow/providers/snowflake/hooks/index + airflow/providers/snowflake/hooks/airflow_snowflake/index - airflow/providers/sqlite/hooks/index + airflow/providers/sqlite/hooks/sqlite/index - airflow/providers/ssh/hooks/index + airflow/providers/ssh/hooks/ssh/index - airflow/providers/vertica/hooks/index + airflow/providers/vertica/hooks/vertica/index - airflow/providers/zendesk/hooks/index + airflow/providers/zendesk/hooks/zendesk/index Executors --------- diff --git a/docs/build.sh b/docs/build.sh index 64ee6b58046f7..aa615c9711484 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -80,7 +80,9 @@ echo echo "Checking the status of the operators-and-hooks-ref.rst file." echo -mapfile -t DEPRECATED_MODULES < <(grep -R -i -l 'This module is deprecated.' ../airflow --include '*.py' | \ +mapfile -t DEPRECATED_MODULES < <(grep -R \ + -i -l 'This module is deprecated.' ../airflow --exclude-dir=node_modules \ + --include '*.py' | \ cut -d "/" -f 2- | \ sort | \ uniq | \ @@ -89,7 +91,8 @@ mapfile -t DEPRECATED_MODULES < <(grep -R -i -l 'This module is deprecated.' ../ IGNORED_MISSING_MODULES=('airflow.providers.google.cloud.hooks.base') -mapfile -t ALL_MODULES < <(find ../airflow/{,gcp/,providers/*/*/,providers/*/}{operators,sensors,hooks} -name "*.py" | \ +mapfile -t ALL_MODULES < <(find ../airflow/{providers/*/*/,providers/*/}{operators,sensors,hooks} \ + -name "*.py" | \ grep -v "__init__" | \ grep -v "__pycache__" | \ cut -d "/" -f 2- | \ @@ -141,7 +144,7 @@ SUCCEED_LINE=$(make html |\ NUM_CURRENT_WARNINGS=$(echo "${SUCCEED_LINE}" |\ sed -E 's/build succeeded, ([0-9]+) warnings?\./\1/g') -if [[ -f /.dockerenv ]]; then +if [[ -f /.dockerenv && -n "${HOST_USER_ID}" ]]; then # We are inside the container which means that we should fix back the permissions of the # _build and _api folder files, so that they can be accessed by the host user # The _api folder should be deleted by then but just in case we should change the ownership diff --git a/docs/concepts.rst b/docs/concepts.rst index 31054b00d6ecf..d84dd26e502c4 100644 --- a/docs/concepts.rst +++ b/docs/concepts.rst @@ -276,7 +276,7 @@ Airflow provides operators for many common tasks, including: - ``Sensor`` - an Operator that waits (polls) for a certain time, file, database row, S3 key, etc... In addition to these basic building blocks, there are many more specific -operators: :class:`~airflow.providers.docker.operators.docker.DockerOperator`, +operators: :class:`~airflow.providers.docker.operators.docker_operator.DockerOperator`, :class:`~airflow.providers.apache.hive.operators.hive.HiveOperator`, :class:`~airflow.providers.amazon.aws.operators.s3_file_transform.S3FileTransformOperator`, :class:`~airflow.providers.mysql.operators.presto_to_mysql.PrestoToMySqlTransfer`, :class:`~airflow.providers.slack.operators.slack.SlackAPIOperator`... you get the idea! diff --git a/docs/conf.py b/docs/conf.py index 7dd20f2ee8a6b..37e5772361ef4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,6 +42,7 @@ try: import sphinx_airflow_theme # pylint: disable=unused-import + airflow_theme_is_available = True except ImportError: airflow_theme_is_available = False @@ -260,7 +261,6 @@ # If true, keep warnings as "system message" paragraphs in the built documents. keep_warnings = True - intersphinx_mapping = { 'boto3': ('https://boto3.amazonaws.com/v1/documentation/api/latest/', None), 'mongodb': ('https://api.mongodb.com/python/current/', None), @@ -485,7 +485,7 @@ '*/airflow/contrib/sensors/*', '*/airflow/contrib/hooks/*', '*/airflow/contrib/operators/*', - + '*/airflow/hooks/zendesk_hook', '*/node_modules/*', '*/migrations/*', ] @@ -525,3 +525,91 @@ 'github_version': os.environ.get('GITHUB_TREE', None), 'display_github': os.environ.get('GITHUB_TREE', None) is not None, } + +# Monkey-patching for implicit namespaces + +import autoapi.mappers.python.mapper # isort:skip # pylint: disable=wrong-import-position,wrong-import-order +import autoapi.mappers.python.parser # isort:skip # pylint: disable=wrong-import-position,wrong-import-order +# pylint: disable=redefined-outer-name + + +def __namespace_autoapi_mapper__find_files(self, patterns, dirs, ignore): + for dir_ in dirs: + dir_root = os.path.abspath(os.path.join(dir_, os.pardir)) + for path in self.find_files(patterns=patterns, dirs=[dir_], ignore=ignore): + yield dir_root, path + + +def __namespace_autoapi_mapper_load(self, patterns, dirs, ignore=None): + """Load objects from the filesystem into the ``paths`` dictionary + Also include an attribute on the object, ``relative_path`` which is the + shortened, relative path the package/module + """ + import sphinx + from sphinx.util.console import bold # pylint: disable=no-name-in-module + + + dir_root_files = list(self._find_files(patterns, dirs, ignore)) # pylint: disable=protected-access + for dir_root, path in sphinx.util.status_iterator( + dir_root_files, + bold("[AutoAPI] [With Implicit Packages] Reading files... "), + length=len(dir_root_files), + stringify_func=(lambda x: x[1]), + ): + data = self.read_file(path=path, dir_root=dir_root) + if data: + data["relative_path"] = os.path.relpath(path, dir_root) + self.paths[path] = data + +def __namespace_autoapi_mapper_read_file(self, path, **kwargs): # pylint: disable=unused-argument + dir_root = kwargs.get("dir_root") + try: + parsed_data = autoapi.mappers.python.parser.Parser().parse_file_in_namespace(path, dir_root) + return parsed_data + except (IOError, TypeError, ImportError): + autoapi.mappers.python.mapper.LOGGER.warning("Error reading file: {0}".format(path)) + return None + + +def __namespace_autoapi_parser_parse_file_in_namespace(self, path, dir_root): + return self._parse_file( # pylint: disable=protected-access + path, lambda directory: os.path.abspath(directory) != dir_root + ) + + +def __namespace_autoapi_parser__parse_file(self, path, condition): + import astroid + import collections + directory, filename = os.path.split(path) + module_parts = [] + if filename != "__init__.py": + module_part = os.path.splitext(filename)[0] + module_parts = [module_part] + module_parts = collections.deque(module_parts) + while directory and condition(directory): + directory, module_part = os.path.split(directory) + if module_part: + module_parts.appendleft(module_part) + + module_name = ".".join(module_parts) + node = astroid.MANAGER.ast_from_file(path, module_name, source=True) + return self.parse(node) + + +def __namespace_autoapi_parser_parse_file(self, path): + return self._parse_file( # pylint: disable=protected-access + path, + lambda directory: os.path.isfile(os.path.join(directory, "__init__.py")), + ) + + +autoapi.mappers.python.mapper.PythonSphinxMapper._find_files = \ + __namespace_autoapi_mapper__find_files # pylint: disable=protected-access +autoapi.mappers.python.mapper.PythonSphinxMapper.load = __namespace_autoapi_mapper_load +autoapi.mappers.python.mapper.PythonSphinxMapper.read_file = __namespace_autoapi_mapper_read_file +autoapi.mappers.python.parser.Parser.parse_file_in_namespace = \ + __namespace_autoapi_parser_parse_file_in_namespace +autoapi.mappers.python.parser.Parser.parse_file = \ + __namespace_autoapi_parser_parse_file +autoapi.mappers.python.parser.Parser._parse_file = \ + __namespace_autoapi_parser__parse_file # pylint: disable=protected-access diff --git a/docs/exts/__init__.py b/docs/exts/__init__.py deleted file mode 100644 index dd26d4ff9adea..0000000000000 --- a/docs/exts/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# flake8: noqa -# Disable Flake8 because of all the sphinx imports -# -# 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 -# -# 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. diff --git a/docs/howto/connection/grpc.rst b/docs/howto/connection/grpc.rst index e56b9c9de4b7a..ba8c36f683462 100644 --- a/docs/howto/connection/grpc.rst +++ b/docs/howto/connection/grpc.rst @@ -45,7 +45,7 @@ Default Connection IDs The following connection IDs are used by default. ``grpc_default`` - Used by the :class:`~airflow.providers.grpc.hooks.grpc.GrpcHook` + Used by the :class:`~airflow.providers.grpc.hooks.airflow_grpc.GrpcHook` hook. Configuring the Connection diff --git a/docs/howto/email-config.rst b/docs/howto/email-config.rst index 3c7d3015cb4f9..bb68889dc47bb 100644 --- a/docs/howto/email-config.rst +++ b/docs/howto/email-config.rst @@ -26,7 +26,7 @@ in the ``email`` section. [email] - email_backend = airflow.utils.email.send_email_smtp + email_backend = airflow.utils.email_utils.send_email_smtp subject_template = /path/to/my_subject_template_file html_content_template = /path/to/my_html_content_template_file diff --git a/docs/operators-and-hooks-ref.rst b/docs/operators-and-hooks-ref.rst index db901dc606628..d1bcfd42c3c63 100644 --- a/docs/operators-and-hooks-ref.rst +++ b/docs/operators-and-hooks-ref.rst @@ -1,3 +1,4 @@ + .. 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 @@ -77,7 +78,7 @@ Foundation. * - `Apache Cassandra `__ - - - :mod:`airflow.providers.apache.cassandra.hooks.cassandra` + - :mod:`airflow.providers.apache.cassandra.hooks.airflow_cassandra` - - :mod:`airflow.providers.apache.cassandra.sensors.record`, :mod:`airflow.providers.apache.cassandra.sensors.table` @@ -129,7 +130,7 @@ Foundation. * - `Hadoop Distributed File System (HDFS) `__ - - - :mod:`airflow.providers.apache.hdfs.hooks.hdfs` + - :mod:`airflow.providers.apache.hdfs.hooks.airflow_hdfs` - - :mod:`airflow.providers.apache.hdfs.sensors.hdfs` @@ -864,9 +865,9 @@ These integrations allow you to perform various operations within various servic * - `Atlassian Jira `__ - - - :mod:`airflow.providers.jira.hooks.jira` + - :mod:`airflow.providers.jira.hooks.airflow_jira` - :mod:`airflow.providers.jira.operators.jira` - - :mod:`airflow.providers.jira.sensors.jira` + - :mod:`airflow.providers.jira.sensors.airflow_jira` * - `Databricks `__ - @@ -878,7 +879,7 @@ These integrations allow you to perform various operations within various servic - - :mod:`airflow.providers.datadog.hooks.datadog` - - - :mod:`airflow.providers.datadog.sensors.datadog` + - :mod:`airflow.providers.datadog.sensors.airflow_datadog` * - `Pagerduty `__ - @@ -930,7 +931,7 @@ These integrations allow you to perform various operations within various servic * - `IBM Cloudant `__ - - - :mod:`airflow.providers.cloudant.hooks.cloudant` + - :mod:`airflow.providers.cloudant.hooks.airflow_cloudant` - - @@ -976,7 +977,7 @@ These integrations allow you to perform various operations within various servic * - `Snowflake `__ - - - :mod:`airflow.providers.snowflake.hooks.snowflake` + - :mod:`airflow.providers.snowflake.hooks.airflow_snowflake` - :mod:`airflow.providers.snowflake.operators.snowflake` - @@ -1047,8 +1048,8 @@ These integrations allow you to perform various operations using various softwar * - `Docker `__ - - - :mod:`airflow.providers.docker.hooks.docker` - - :mod:`airflow.providers.docker.operators.docker`, + - :mod:`airflow.providers.docker.hooks.airflow_docker` + - :mod:`airflow.providers.docker.operators.docker_operator`, :mod:`airflow.providers.docker.operators.docker_swarm` - @@ -1129,7 +1130,7 @@ These integrations allow you to perform various operations using various softwar * - `Redis `__ - - - :mod:`airflow.providers.redis.hooks.redis` + - :mod:`airflow.providers.redis.hooks.airflow_redis` - :mod:`airflow.providers.redis.operators.redis_publish` - :mod:`airflow.providers.redis.sensors.redis_pub_sub`, :mod:`airflow.providers.redis.sensors.redis_key` @@ -1300,14 +1301,14 @@ communication protocols or interface. * - `Windows Remote Management (WinRM) `__ - - - :mod:`airflow.providers.microsoft.winrm.hooks.winrm` - - :mod:`airflow.providers.microsoft.winrm.operators.winrm` + - :mod:`airflow.providers.microsoft.winrm.hooks.airflow_winrm` + - :mod:`airflow.providers.microsoft.winrm.operators.airflow_winrm` - * - `gRPC `__ - - - :mod:`airflow.providers.grpc.hooks.grpc` - - :mod:`airflow.providers.grpc.operators.grpc` + - :mod:`airflow.providers.grpc.hooks.airflow_grpc` + - :mod:`airflow.providers.grpc.operators.airflow_grpc` - Transfer operators and hooks diff --git a/airflow/kubernetes/__init__.py b/pylint_plugins/__init__.py similarity index 100% rename from airflow/kubernetes/__init__.py rename to pylint_plugins/__init__.py diff --git a/tests/airflow_pylint/do_not_use_asserts.py b/pylint_plugins/do_not_use_asserts.py similarity index 78% rename from tests/airflow_pylint/do_not_use_asserts.py rename to pylint_plugins/do_not_use_asserts.py index e042c694bad38..c1fbc3b58e946 100644 --- a/tests/airflow_pylint/do_not_use_asserts.py +++ b/pylint_plugins/do_not_use_asserts.py @@ -21,6 +21,10 @@ class DoNotUseAssertsChecker(BaseChecker): + """ + The pylint plugin makes sure that no asserts are used in the main + code of the application. + """ __implements__ = IAstroidChecker name = 'do-not-use-asserts' @@ -34,10 +38,20 @@ class DoNotUseAssertsChecker(BaseChecker): } def visit_assert(self, node): + """ + Callback executed when assert is being visited by the parser. + @param node: node where assert is being visited + @return: None + """ self.add_message( self.name, node=node, ) def register(linter: PyLinter): + """ + Registers the plugin. + @param linter: linter to register the check + @return: None + """ linter.register_checker(DoNotUseAssertsChecker(linter)) diff --git a/pylintrc b/pylintrc index 2619a0f4b4315..70a9df9701615 100644 --- a/pylintrc +++ b/pylintrc @@ -43,7 +43,7 @@ limit-inference-results=100 # List of plugins (as comma separated values of python modules names) to load, # usually to register additional checkers. -load-plugins=tests.airflow_pylint.do_not_use_asserts +load-plugins=pylint_plugins.do_not_use_asserts # Pickle collected data for later comparisons. persistent=yes diff --git a/airflow/bin/airflow b/scripts/ci/airflow similarity index 100% rename from airflow/bin/airflow rename to scripts/ci/airflow diff --git a/airflow/bin/airflow_scheduler_autorestart.sh b/scripts/ci/airflow_scheduler_autorestart.sh similarity index 100% rename from airflow/bin/airflow_scheduler_autorestart.sh rename to scripts/ci/airflow_scheduler_autorestart.sh diff --git a/airflow/bin/cli.py b/scripts/ci/cli.py similarity index 100% rename from airflow/bin/cli.py rename to scripts/ci/cli.py diff --git a/scripts/ci/docker-compose/base.yml b/scripts/ci/docker-compose/base.yml index ee7c06b3ec5b2..64a7b1860b1aa 100644 --- a/scripts/ci/docker-compose/base.yml +++ b/scripts/ci/docker-compose/base.yml @@ -39,7 +39,6 @@ services: - TRAVIS_BUILD_ID - TRAVIS_JOB_ID - TRAVIS_JOB_NUMBER - - TRAVIS_PULL_REQUEST - TRAVIS_COMMIT - TRAVIS_REPO_SLUG - TRAVIS_PULL_REQUEST_BRANCH diff --git a/scripts/ci/docker-compose/local.yml b/scripts/ci/docker-compose/local.yml index cd34dda20be44..7ce0dd362bb11 100644 --- a/scripts/ci/docker-compose/local.yml +++ b/scripts/ci/docker-compose/local.yml @@ -47,6 +47,7 @@ services: - ../../../hooks:/opt/airflow/hooks:cached - ../../../logs:/root/airflow/logs:cached - ../../../pylintrc:/opt/airflow/pylintrc:cached + - ../../../pylint_plugins:/opt/airflow/pylint_plugins:cached - ../../../pytest.ini:/opt/airflow/pytest.ini:cached - ../../../scripts:/opt/airflow/scripts:cached - ../../../scripts/ci/in_container/entrypoint_ci.sh:/entrypoint_ci.sh:cached diff --git a/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml b/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml index 5bc21dbb6979b..f5ed862b91300 100644 --- a/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml +++ b/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml @@ -145,7 +145,7 @@ data: [smtp] # If you want airflow to send emails on retries, failure, and you want to use - # the airflow.utils.email.send_email_smtp function, you have to configure an + # the airflow.utils.email_utils.send_email_smtp function, you have to configure an # smtp server here smtp_host = localhost smtp_starttls = True diff --git a/scripts/ci/pre_commit_mypy.sh b/scripts/ci/pre_commit_mypy.sh index d137d20fce9c0..f379ce74f6287 100755 --- a/scripts/ci/pre_commit_mypy.sh +++ b/scripts/ci/pre_commit_mypy.sh @@ -22,4 +22,4 @@ MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export FORCE_ANSWER_TO_QUESTIONS=${FORCE_ANSWER_TO_QUESTIONS:="quit"} export REMEMBER_LAST_ANSWER="true" -"${MY_DIR}/ci_mypy.sh" "${@}" +"${MY_DIR}/ci_mypy.sh" airflow tests pylint_plugins diff --git a/airflow/api/common/__init__.py b/scripts/ci/pre_commit_remove_empty_init_py.sh old mode 100644 new mode 100755 similarity index 79% rename from airflow/api/common/__init__.py rename to scripts/ci/pre_commit_remove_empty_init_py.sh index 217e5db960782..8d4f995e14705 --- a/airflow/api/common/__init__.py +++ b/scripts/ci/pre_commit_remove_empty_init_py.sh @@ -1,4 +1,4 @@ -# +#!/usr/bin/env bash # 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 @@ -15,3 +15,12 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +set -uo pipefail + +for FILE in "${@}" +do + NON_EMPTY_LINES=$(grep -v "^#.*" "${FILE}" | grep -vc "^$") + if [[ ${NON_EMPTY_LINES} == "0" ]]; then + rm -f "${FILE}" + fi +done diff --git a/scripts/ci/pylint_todo.txt b/scripts/ci/pylint_todo.txt index 54545001fa8bb..e3caa99af8db7 100644 --- a/scripts/ci/pylint_todo.txt +++ b/scripts/ci/pylint_todo.txt @@ -99,7 +99,6 @@ ./airflow/operators/dagrun_operator.py ./airflow/providers/apache/druid/operators/druid_check.py ./airflow/operators/dummy_operator.py -./airflow/providers/email/operators/email.py ./airflow/operators/generic_transfer.py ./airflow/providers/apache/hive/operators/hive.py ./airflow/providers/apache/hive/operators/hive_stats.py diff --git a/setup.py b/setup.py index 8246c2aafcb2f..3d6908df6c9e4 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ from importlib import util from typing import List -from setuptools import Command, find_packages, setup +from setuptools import Command, find_namespace_packages, setup logger = logging.getLogger(__name__) @@ -117,6 +117,9 @@ def git_version(version_: str) -> str: except git.NoSuchPathError: logger.warning('.git directory not found: Cannot compute the git version') return '' + except git.InvalidGitRepositoryError: + logger.warning('Invalid .git directory not found: Cannot compute the git version') + return '' except ImportError: logger.warning('gitpython not found: Cannot compute the git version.') return '' @@ -190,7 +193,7 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])): doc = [ 'sphinx>=2.1.2', 'sphinx-argparse>=0.1.13', - 'sphinx-autoapi==1.0.0', + 'sphinx-autoapi==1.2.1', 'sphinx-jinja~=1.1', 'sphinx-rtd-theme>=0.1.6', 'sphinxcontrib-httpdomain>=1.7.0', @@ -433,7 +436,7 @@ def do_setup(): long_description_content_type='text/markdown', license='Apache License 2.0', version=version, - packages=find_packages(exclude=['tests*']), + packages=find_namespace_packages(exclude=['tests*']), package_data={ '': ['airflow/alembic.ini', "airflow/git_version", "*.ipynb"], 'airflow.serialization': ["*.json"], diff --git a/tests/__init__.py b/tests/__init__.py index 217e5db960782..13a83393a9124 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,3 @@ -# # 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 diff --git a/tests/airflow_pylint/__init__.py b/tests/airflow_pylint/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/airflow_pylint/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/api/__init__.py b/tests/api/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/api/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/api/client/__init__.py b/tests/api/client/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/api/client/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/api/common/__init__.py b/tests/api/common/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/api/common/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/api/common/experimental/__init__.py b/tests/api/common/experimental/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/api/common/experimental/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/bats/test_yaml_parser.bats b/tests/bats/test_yaml_parser.bats index ecb429c51bed3..b6a2eee31fe8f 100644 --- a/tests/bats/test_yaml_parser.bats +++ b/tests/bats/test_yaml_parser.bats @@ -54,13 +54,14 @@ services_airflow-testing_volumes_20="../../../files:/files:cached" services_airflow-testing_volumes_21="../../../hooks:/opt/airflow/hooks:cached" services_airflow-testing_volumes_22="../../../logs:/root/airflow/logs:cached" services_airflow-testing_volumes_23="../../../pylintrc:/opt/airflow/pylintrc:cached" -services_airflow-testing_volumes_24="../../../pytest.ini:/opt/airflow/pytest.ini:cached" -services_airflow-testing_volumes_25="../../../scripts:/opt/airflow/scripts:cached" -services_airflow-testing_volumes_26="../../../scripts/ci/in_container/entrypoint_ci.sh:/entrypoint_ci.sh:cached" -services_airflow-testing_volumes_27="../../../setup.cfg:/opt/airflow/setup.cfg:cached" -services_airflow-testing_volumes_28="../../../setup.py:/opt/airflow/setup.py:cached" -services_airflow-testing_volumes_29="../../../tests:/opt/airflow/tests:cached" -services_airflow-testing_volumes_30="../../../tmp:/opt/airflow/tmp:cached" +services_airflow-testing_volumes_24="../../../pylint_plugins:/opt/airflow/pylint_plugins:cached" +services_airflow-testing_volumes_25="../../../pytest.ini:/opt/airflow/pytest.ini:cached" +services_airflow-testing_volumes_26="../../../scripts:/opt/airflow/scripts:cached" +services_airflow-testing_volumes_27="../../../scripts/ci/in_container/entrypoint_ci.sh:/entrypoint_ci.sh:cached" +services_airflow-testing_volumes_28="../../../setup.cfg:/opt/airflow/setup.cfg:cached" +services_airflow-testing_volumes_29="../../../setup.py:/opt/airflow/setup.py:cached" +services_airflow-testing_volumes_30="../../../tests:/opt/airflow/tests:cached" +services_airflow-testing_volumes_31="../../../tmp:/opt/airflow/tmp:cached" services_airflow-testing_environment_1="HOST_USER_ID" services_airflow-testing_environment_2="HOST_GROUP_ID" services_airflow-testing_environment_3="PYTHONDONTWRITEBYTECODE" @@ -120,6 +121,8 @@ ${AIRFLOW_SOURCES}/logs:/root/airflow/logs:cached -v ${AIRFLOW_SOURCES}/pylintrc:/opt/airflow/pylintrc:cached -v +${AIRFLOW_SOURCES}/pylint_plugins:/opt/airflow/pylint_plugins:cached +-v ${AIRFLOW_SOURCES}/pytest.ini:/opt/airflow/pytest.ini:cached -v ${AIRFLOW_SOURCES}/scripts:/opt/airflow/scripts:cached diff --git a/tests/cli/__init__.py b/tests/cli/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/cli/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/cli/commands/__init__.py b/tests/cli/commands/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/tests/cli/commands/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/tests/contrib/__init__.py b/tests/contrib/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/contrib/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/contrib/utils/__init__.py b/tests/contrib/utils/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/tests/contrib/utils/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/tests/contrib/utils/test_sendgrid.py b/tests/contrib/utils/test_sendgrid.py index eb61f129b7ca4..298b6ef2cdb28 100644 --- a/tests/contrib/utils/test_sendgrid.py +++ b/tests/contrib/utils/test_sendgrid.py @@ -24,7 +24,7 @@ import mock -from airflow.contrib.utils.sendgrid import send_email +from airflow.contrib.utils.airflow_sendgrid import send_email class TestSendEmailSendGrid(unittest.TestCase): @@ -64,7 +64,7 @@ def setUp(self): # Test the right email is constructed. @mock.patch.dict('os.environ', SENDGRID_MAIL_FROM='foo@bar.com') - @mock.patch('airflow.contrib.utils.sendgrid._post_sendgrid_mail') + @mock.patch('airflow.contrib.utils.airflow_sendgrid._post_sendgrid_mail') def test_send_email_sendgrid_correct_email(self, mock_post): with tempfile.NamedTemporaryFile(mode='wt', suffix='.txt') as f: f.write('this is some test data') @@ -96,7 +96,7 @@ def test_send_email_sendgrid_correct_email(self, mock_post): SENDGRID_MAIL_FROM='foo@bar.com', SENDGRID_MAIL_SENDER='Foo' ) - @mock.patch('airflow.contrib.utils.sendgrid._post_sendgrid_mail') + @mock.patch('airflow.contrib.utils.airflow_sendgrid._post_sendgrid_mail') def test_send_email_sendgrid_correct_email_extras(self, mock_post): send_email(self.recepients, self.subject, self.html_content, cc=self.carbon_copy, bcc=self.bcc, personalization_custom_args=self.personalization_custom_args, @@ -104,7 +104,7 @@ def test_send_email_sendgrid_correct_email_extras(self, mock_post): mock_post.assert_called_once_with(self.expected_mail_data_extras) @mock.patch.dict('os.environ', clear=True) - @mock.patch('airflow.contrib.utils.sendgrid._post_sendgrid_mail') + @mock.patch('airflow.contrib.utils.airflow_sendgrid._post_sendgrid_mail') def test_send_email_sendgrid_sender(self, mock_post): send_email(self.recepients, self.subject, self.html_content, cc=self.carbon_copy, bcc=self.bcc, from_email='foo@foo.bar', from_name='Foo Bar') diff --git a/tests/executors/__init__.py b/tests/executors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/executors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/hooks/__init__.py b/tests/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/jobs/__init__.py b/tests/jobs/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/tests/jobs/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/tests/jobs/test_scheduler_job.py b/tests/jobs/test_scheduler_job.py index c8ab3bbe5eb62..eac954e52ab6b 100644 --- a/tests/jobs/test_scheduler_job.py +++ b/tests/jobs/test_scheduler_job.py @@ -339,7 +339,7 @@ def test_dag_file_processor_only_collect_emails_from_sla_missed_tasks(self, mock self.assertIn(email1, send_email_to) self.assertNotIn(email2, send_email_to) - @mock.patch("airflow.utils.email.send_email") + @mock.patch("airflow.utils.email_utils.send_email") def test_dag_file_processor_sla_miss_email_exception(self, mock_send_email): """ Test that the dag file processor gracefully logs an exception if there is a problem @@ -2688,7 +2688,7 @@ def test_list_py_file_paths(self): ignored_files = { 'helper.py', } - example_dag_folder = airflow.example_dags.__path__[0] + example_dag_folder = airflow.example_dags.__path__._path[0] # pylint: disable=no-member for root, _, files in os.walk(example_dag_folder): # pylint: disable=too-many-nested-blocks for file_name in files: if file_name.endswith('.py') or file_name.endswith('.zip'): diff --git a/tests/kubernetes/__init__.py b/tests/kubernetes/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/kubernetes/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/kubernetes/models/__init__.py b/tests/kubernetes/models/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/kubernetes/models/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/lineage/__init__.py b/tests/lineage/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/lineage/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/macros/__init__.py b/tests/macros/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/tests/macros/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/tests/models/test_dagbag.py b/tests/models/test_dagbag.py index 1a93ef68257cf..d9562e2ad6b41 100644 --- a/tests/models/test_dagbag.py +++ b/tests/models/test_dagbag.py @@ -215,7 +215,7 @@ def test_refresh_py_dag(self, mock_dagmodel): """ Test that we can refresh an ordinary .py DAG """ - example_dags_folder = airflow.example_dags.__path__[0] + example_dags_folder = airflow.example_dags.__path__._path[0] # pylint: disable=no-member dag_id = "example_bash_operator" fileloc = os.path.realpath( diff --git a/tests/models/test_serialized_dag.py b/tests/models/test_serialized_dag.py index 39084b19e3417..cd72c97d4346e 100644 --- a/tests/models/test_serialized_dag.py +++ b/tests/models/test_serialized_dag.py @@ -30,7 +30,7 @@ # To move it to a shared module. def make_example_dags(module): """Loads DAGs from a module for test.""" - dagbag = DagBag(module.__path__[0]) + dagbag = DagBag(module.__path__._path[0]) return dagbag.dags diff --git a/tests/operators/__init__.py b/tests/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/plugins/__init__.py b/tests/plugins/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/plugins/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/__init__.py b/tests/providers/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/airflow/bin/__init__.py b/tests/providers/add_suffixes.sh old mode 100644 new mode 100755 similarity index 74% rename from airflow/bin/__init__.py rename to tests/providers/add_suffixes.sh index 217e5db960782..5792edd577b11 --- a/airflow/bin/__init__.py +++ b/tests/providers/add_suffixes.sh @@ -1,4 +1,4 @@ -# +#!/usr/bin/env bash # 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 @@ -15,3 +15,13 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +cd "$1" || exit +for TYPE in sensors operators hooks +do + for i in "${TYPE}"/*.py + do + if [[ $i != *system* && $i != *${TYPE}.py && $i != ${TYPE}/\*.py ]]; then + mv -v "$i" "${TYPE}/$(basename "$i" .py)_${TYPE}.py" + fi + done +done diff --git a/tests/providers/amazon/__init__.py b/tests/providers/amazon/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/amazon/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/amazon/aws/__init__.py b/tests/providers/amazon/aws/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/amazon/aws/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/amazon/aws/hooks/__init__.py b/tests/providers/amazon/aws/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/amazon/aws/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/amazon/aws/hooks/test_aws_dynamodb_hook.py b/tests/providers/amazon/aws/hooks/test_aws_dynamodb_hook_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_aws_dynamodb_hook.py rename to tests/providers/amazon/aws/hooks/test_aws_dynamodb_hook_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_aws_hook.py b/tests/providers/amazon/aws/hooks/test_aws_hook_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_aws_hook.py rename to tests/providers/amazon/aws/hooks/test_aws_hook_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_batch_client.py b/tests/providers/amazon/aws/hooks/test_batch_client_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_batch_client.py rename to tests/providers/amazon/aws/hooks/test_batch_client_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_batch_waiters.py b/tests/providers/amazon/aws/hooks/test_batch_waiters_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_batch_waiters.py rename to tests/providers/amazon/aws/hooks/test_batch_waiters_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_cloud_formation.py b/tests/providers/amazon/aws/hooks/test_cloud_formation_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_cloud_formation.py rename to tests/providers/amazon/aws/hooks/test_cloud_formation_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_datasync.py b/tests/providers/amazon/aws/hooks/test_datasync_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_datasync.py rename to tests/providers/amazon/aws/hooks/test_datasync_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_emr.py b/tests/providers/amazon/aws/hooks/test_emr_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_emr.py rename to tests/providers/amazon/aws/hooks/test_emr_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_glue_catalog.py b/tests/providers/amazon/aws/hooks/test_glue_catalog_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_glue_catalog.py rename to tests/providers/amazon/aws/hooks/test_glue_catalog_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_kinesis.py b/tests/providers/amazon/aws/hooks/test_kinesis_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_kinesis.py rename to tests/providers/amazon/aws/hooks/test_kinesis_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_lambda_function.py b/tests/providers/amazon/aws/hooks/test_lambda_function_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_lambda_function.py rename to tests/providers/amazon/aws/hooks/test_lambda_function_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_logs.py b/tests/providers/amazon/aws/hooks/test_logs_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_logs.py rename to tests/providers/amazon/aws/hooks/test_logs_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_redshift.py b/tests/providers/amazon/aws/hooks/test_redshift_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_redshift.py rename to tests/providers/amazon/aws/hooks/test_redshift_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_sagemaker.py b/tests/providers/amazon/aws/hooks/test_sagemaker_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_sagemaker.py rename to tests/providers/amazon/aws/hooks/test_sagemaker_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_sns.py b/tests/providers/amazon/aws/hooks/test_sns_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_sns.py rename to tests/providers/amazon/aws/hooks/test_sns_hooks.py diff --git a/tests/providers/amazon/aws/hooks/test_sqs.py b/tests/providers/amazon/aws/hooks/test_sqs_hooks.py similarity index 100% rename from tests/providers/amazon/aws/hooks/test_sqs.py rename to tests/providers/amazon/aws/hooks/test_sqs_hooks.py diff --git a/tests/providers/amazon/aws/operators/__init__.py b/tests/providers/amazon/aws/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/amazon/aws/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/amazon/aws/operators/test_athena.py b/tests/providers/amazon/aws/operators/test_athena_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_athena.py rename to tests/providers/amazon/aws/operators/test_athena_operators.py diff --git a/tests/providers/amazon/aws/operators/test_batch.py b/tests/providers/amazon/aws/operators/test_batch_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_batch.py rename to tests/providers/amazon/aws/operators/test_batch_operators.py diff --git a/tests/providers/amazon/aws/operators/test_cloud_formation.py b/tests/providers/amazon/aws/operators/test_cloud_formation_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_cloud_formation.py rename to tests/providers/amazon/aws/operators/test_cloud_formation_operators.py diff --git a/tests/providers/amazon/aws/operators/test_datasync.py b/tests/providers/amazon/aws/operators/test_datasync_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_datasync.py rename to tests/providers/amazon/aws/operators/test_datasync_operators.py diff --git a/tests/providers/amazon/aws/operators/test_dynamodb_to_s3.py b/tests/providers/amazon/aws/operators/test_dynamodb_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_dynamodb_to_s3.py rename to tests/providers/amazon/aws/operators/test_dynamodb_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_ecs.py b/tests/providers/amazon/aws/operators/test_ecs_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_ecs.py rename to tests/providers/amazon/aws/operators/test_ecs_operators.py diff --git a/tests/providers/amazon/aws/operators/test_emr_add_steps.py b/tests/providers/amazon/aws/operators/test_emr_add_steps_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_emr_add_steps.py rename to tests/providers/amazon/aws/operators/test_emr_add_steps_operators.py diff --git a/tests/providers/amazon/aws/operators/test_emr_create_job_flow.py b/tests/providers/amazon/aws/operators/test_emr_create_job_flow_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_emr_create_job_flow.py rename to tests/providers/amazon/aws/operators/test_emr_create_job_flow_operators.py diff --git a/tests/providers/amazon/aws/operators/test_emr_modify_cluster.py b/tests/providers/amazon/aws/operators/test_emr_modify_cluster_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_emr_modify_cluster.py rename to tests/providers/amazon/aws/operators/test_emr_modify_cluster_operators.py diff --git a/tests/providers/amazon/aws/operators/test_emr_terminate_job_flow.py b/tests/providers/amazon/aws/operators/test_emr_terminate_job_flow_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_emr_terminate_job_flow.py rename to tests/providers/amazon/aws/operators/test_emr_terminate_job_flow_operators.py diff --git a/tests/providers/amazon/aws/operators/test_gcs_to_s3.py b/tests/providers/amazon/aws/operators/test_gcs_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_gcs_to_s3.py rename to tests/providers/amazon/aws/operators/test_gcs_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_google_api_to_s3_transfer.py b/tests/providers/amazon/aws/operators/test_google_api_to_s3_transfer_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_google_api_to_s3_transfer.py rename to tests/providers/amazon/aws/operators/test_google_api_to_s3_transfer_operators.py diff --git a/tests/providers/amazon/aws/operators/test_hive_to_dynamodb.py b/tests/providers/amazon/aws/operators/test_hive_to_dynamodb_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_hive_to_dynamodb.py rename to tests/providers/amazon/aws/operators/test_hive_to_dynamodb_operators.py diff --git a/tests/providers/amazon/aws/operators/test_imap_attachment_to_s3.py b/tests/providers/amazon/aws/operators/test_imap_attachment_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_imap_attachment_to_s3.py rename to tests/providers/amazon/aws/operators/test_imap_attachment_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_mongo_to_s3.py b/tests/providers/amazon/aws/operators/test_mongo_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_mongo_to_s3.py rename to tests/providers/amazon/aws/operators/test_mongo_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_redshift_to_s3.py b/tests/providers/amazon/aws/operators/test_redshift_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_redshift_to_s3.py rename to tests/providers/amazon/aws/operators/test_redshift_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_copy_object.py b/tests/providers/amazon/aws/operators/test_s3_copy_object_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_copy_object.py rename to tests/providers/amazon/aws/operators/test_s3_copy_object_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_delete_objects.py b/tests/providers/amazon/aws/operators/test_s3_delete_objects_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_delete_objects.py rename to tests/providers/amazon/aws/operators/test_s3_delete_objects_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_file_transform.py b/tests/providers/amazon/aws/operators/test_s3_file_transform_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_file_transform.py rename to tests/providers/amazon/aws/operators/test_s3_file_transform_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_list.py b/tests/providers/amazon/aws/operators/test_s3_list_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_list.py rename to tests/providers/amazon/aws/operators/test_s3_list_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_to_redshift.py b/tests/providers/amazon/aws/operators/test_s3_to_redshift_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_to_redshift.py rename to tests/providers/amazon/aws/operators/test_s3_to_redshift_operators.py diff --git a/tests/providers/amazon/aws/operators/test_s3_to_sftp.py b/tests/providers/amazon/aws/operators/test_s3_to_sftp_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_s3_to_sftp.py rename to tests/providers/amazon/aws/operators/test_s3_to_sftp_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_base.py b/tests/providers/amazon/aws/operators/test_sagemaker_base_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_base.py rename to tests/providers/amazon/aws/operators/test_sagemaker_base_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_endpoint_config.py b/tests/providers/amazon/aws/operators/test_sagemaker_endpoint_config_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_endpoint_config.py rename to tests/providers/amazon/aws/operators/test_sagemaker_endpoint_config_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_endpoint.py b/tests/providers/amazon/aws/operators/test_sagemaker_endpoint_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_endpoint.py rename to tests/providers/amazon/aws/operators/test_sagemaker_endpoint_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_model.py b/tests/providers/amazon/aws/operators/test_sagemaker_model_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_model.py rename to tests/providers/amazon/aws/operators/test_sagemaker_model_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_training.py b/tests/providers/amazon/aws/operators/test_sagemaker_training_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_training.py rename to tests/providers/amazon/aws/operators/test_sagemaker_training_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_transform.py b/tests/providers/amazon/aws/operators/test_sagemaker_transform_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_transform.py rename to tests/providers/amazon/aws/operators/test_sagemaker_transform_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sagemaker_tuning.py b/tests/providers/amazon/aws/operators/test_sagemaker_tuning_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sagemaker_tuning.py rename to tests/providers/amazon/aws/operators/test_sagemaker_tuning_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sftp_to_s3.py b/tests/providers/amazon/aws/operators/test_sftp_to_s3_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sftp_to_s3.py rename to tests/providers/amazon/aws/operators/test_sftp_to_s3_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sns.py b/tests/providers/amazon/aws/operators/test_sns_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sns.py rename to tests/providers/amazon/aws/operators/test_sns_operators.py diff --git a/tests/providers/amazon/aws/operators/test_sqs.py b/tests/providers/amazon/aws/operators/test_sqs_operators.py similarity index 100% rename from tests/providers/amazon/aws/operators/test_sqs.py rename to tests/providers/amazon/aws/operators/test_sqs_operators.py diff --git a/tests/providers/amazon/aws/sensors/__init__.py b/tests/providers/amazon/aws/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/amazon/aws/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/amazon/aws/sensors/test_athena.py b/tests/providers/amazon/aws/sensors/test_athena_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_athena.py rename to tests/providers/amazon/aws/sensors/test_athena_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_cloud_formation.py b/tests/providers/amazon/aws/sensors/test_cloud_formation_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_cloud_formation.py rename to tests/providers/amazon/aws/sensors/test_cloud_formation_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_emr_base.py b/tests/providers/amazon/aws/sensors/test_emr_base_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_emr_base.py rename to tests/providers/amazon/aws/sensors/test_emr_base_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_emr_job_flow.py b/tests/providers/amazon/aws/sensors/test_emr_job_flow_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_emr_job_flow.py rename to tests/providers/amazon/aws/sensors/test_emr_job_flow_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_emr_step.py b/tests/providers/amazon/aws/sensors/test_emr_step_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_emr_step.py rename to tests/providers/amazon/aws/sensors/test_emr_step_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_glue_catalog_partition.py b/tests/providers/amazon/aws/sensors/test_glue_catalog_partition_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_glue_catalog_partition.py rename to tests/providers/amazon/aws/sensors/test_glue_catalog_partition_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_redshift.py b/tests/providers/amazon/aws/sensors/test_redshift_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_redshift.py rename to tests/providers/amazon/aws/sensors/test_redshift_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_s3_key.py b/tests/providers/amazon/aws/sensors/test_s3_key_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_s3_key.py rename to tests/providers/amazon/aws/sensors/test_s3_key_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_s3_prefix.py b/tests/providers/amazon/aws/sensors/test_s3_prefix_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_s3_prefix.py rename to tests/providers/amazon/aws/sensors/test_s3_prefix_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sagemaker_base.py b/tests/providers/amazon/aws/sensors/test_sagemaker_base_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sagemaker_base.py rename to tests/providers/amazon/aws/sensors/test_sagemaker_base_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sagemaker_endpoint.py b/tests/providers/amazon/aws/sensors/test_sagemaker_endpoint_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sagemaker_endpoint.py rename to tests/providers/amazon/aws/sensors/test_sagemaker_endpoint_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sagemaker_training.py b/tests/providers/amazon/aws/sensors/test_sagemaker_training_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sagemaker_training.py rename to tests/providers/amazon/aws/sensors/test_sagemaker_training_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sagemaker_transform.py b/tests/providers/amazon/aws/sensors/test_sagemaker_transform_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sagemaker_transform.py rename to tests/providers/amazon/aws/sensors/test_sagemaker_transform_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sagemaker_tuning.py b/tests/providers/amazon/aws/sensors/test_sagemaker_tuning_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sagemaker_tuning.py rename to tests/providers/amazon/aws/sensors/test_sagemaker_tuning_sensors.py diff --git a/tests/providers/amazon/aws/sensors/test_sqs.py b/tests/providers/amazon/aws/sensors/test_sqs_sensors.py similarity index 100% rename from tests/providers/amazon/aws/sensors/test_sqs.py rename to tests/providers/amazon/aws/sensors/test_sqs_sensors.py diff --git a/tests/providers/apache/__init__.py b/tests/providers/apache/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/apache/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/apache/cassandra/__init__.py b/tests/providers/apache/cassandra/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/apache/cassandra/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/apache/cassandra/hooks/__init__.py b/tests/providers/apache/cassandra/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/apache/cassandra/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/apache/cassandra/hooks/test_cassandra.py b/tests/providers/apache/cassandra/hooks/test_airflow_cassandra_hooks.py similarity index 99% rename from tests/providers/apache/cassandra/hooks/test_cassandra.py rename to tests/providers/apache/cassandra/hooks/test_airflow_cassandra_hooks.py index a8547684b7199..37af1e49cff27 100644 --- a/tests/providers/apache/cassandra/hooks/test_cassandra.py +++ b/tests/providers/apache/cassandra/hooks/test_airflow_cassandra_hooks.py @@ -26,7 +26,7 @@ ) from airflow.models import Connection -from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook +from airflow.providers.apache.cassandra.hooks.airflow_cassandra import CassandraHook from airflow.utils import db diff --git a/tests/providers/apache/cassandra/sensors/__init__.py b/tests/providers/apache/cassandra/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/apache/cassandra/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/apache/cassandra/sensors/record.py b/tests/providers/apache/cassandra/sensors/record_sensors.py similarity index 100% rename from tests/providers/apache/cassandra/sensors/record.py rename to tests/providers/apache/cassandra/sensors/record_sensors.py diff --git a/tests/providers/apache/cassandra/sensors/table.py b/tests/providers/apache/cassandra/sensors/table_sensors.py similarity index 100% rename from tests/providers/apache/cassandra/sensors/table.py rename to tests/providers/apache/cassandra/sensors/table_sensors.py diff --git a/tests/providers/apache/druid/__init__.py b/tests/providers/apache/druid/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/druid/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/druid/hooks/__init__.py b/tests/providers/apache/druid/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/druid/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/druid/hooks/test_druid.py b/tests/providers/apache/druid/hooks/test_druid_hooks.py similarity index 100% rename from tests/providers/apache/druid/hooks/test_druid.py rename to tests/providers/apache/druid/hooks/test_druid_hooks.py diff --git a/tests/providers/apache/druid/operators/__init__.py b/tests/providers/apache/druid/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/druid/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/druid/operators/test_druid_check.py b/tests/providers/apache/druid/operators/test_druid_check_operators.py similarity index 100% rename from tests/providers/apache/druid/operators/test_druid_check.py rename to tests/providers/apache/druid/operators/test_druid_check_operators.py diff --git a/tests/providers/apache/druid/operators/test_druid.py b/tests/providers/apache/druid/operators/test_druid_operators.py similarity index 100% rename from tests/providers/apache/druid/operators/test_druid.py rename to tests/providers/apache/druid/operators/test_druid_operators.py diff --git a/tests/providers/apache/druid/operators/test_hive_to_druid.py b/tests/providers/apache/druid/operators/test_hive_to_druid_operators.py similarity index 100% rename from tests/providers/apache/druid/operators/test_hive_to_druid.py rename to tests/providers/apache/druid/operators/test_hive_to_druid_operators.py diff --git a/tests/providers/apache/hdfs/__init__.py b/tests/providers/apache/hdfs/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hdfs/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hdfs/hooks/__init__.py b/tests/providers/apache/hdfs/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hdfs/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hdfs/hooks/test_hdfs.py b/tests/providers/apache/hdfs/hooks/test_airflow_hdfs_hooks.py similarity index 97% rename from tests/providers/apache/hdfs/hooks/test_hdfs.py rename to tests/providers/apache/hdfs/hooks/test_airflow_hdfs_hooks.py index ba04d453ed12c..ea5e95994a537 100644 --- a/tests/providers/apache/hdfs/hooks/test_hdfs.py +++ b/tests/providers/apache/hdfs/hooks/test_airflow_hdfs_hooks.py @@ -21,7 +21,7 @@ from unittest import mock from airflow.models import Connection -from airflow.providers.apache.hdfs.hooks.hdfs import HDFSHook +from airflow.providers.apache.hdfs.hooks.airflow_hdfs import HDFSHook try: import snakebite diff --git a/tests/providers/apache/hdfs/hooks/test_webhdfs.py b/tests/providers/apache/hdfs/hooks/test_webhdfs_hooks.py similarity index 100% rename from tests/providers/apache/hdfs/hooks/test_webhdfs.py rename to tests/providers/apache/hdfs/hooks/test_webhdfs_hooks.py diff --git a/tests/providers/apache/hdfs/sensors/__init__.py b/tests/providers/apache/hdfs/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hdfs/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hdfs/sensors/test_hdfs.py b/tests/providers/apache/hdfs/sensors/test_hdfs_sensors.py similarity index 100% rename from tests/providers/apache/hdfs/sensors/test_hdfs.py rename to tests/providers/apache/hdfs/sensors/test_hdfs_sensors.py diff --git a/tests/providers/apache/hive/__init__.py b/tests/providers/apache/hive/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hive/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hive/hooks/__init__.py b/tests/providers/apache/hive/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hive/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hive/hooks/test_hive.py b/tests/providers/apache/hive/hooks/test_hive_hooks.py similarity index 100% rename from tests/providers/apache/hive/hooks/test_hive.py rename to tests/providers/apache/hive/hooks/test_hive_hooks.py diff --git a/tests/providers/apache/hive/operators/__init__.py b/tests/providers/apache/hive/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hive/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hive/operators/test_hive.py b/tests/providers/apache/hive/operators/test_hive_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_hive.py rename to tests/providers/apache/hive/operators/test_hive_operators.py diff --git a/tests/providers/apache/hive/operators/test_hive_stats.py b/tests/providers/apache/hive/operators/test_hive_stats_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_hive_stats.py rename to tests/providers/apache/hive/operators/test_hive_stats_operators.py diff --git a/tests/providers/apache/hive/operators/test_hive_to_mysql.py b/tests/providers/apache/hive/operators/test_hive_to_mysql_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_hive_to_mysql.py rename to tests/providers/apache/hive/operators/test_hive_to_mysql_operators.py diff --git a/tests/providers/apache/hive/operators/test_hive_to_samba.py b/tests/providers/apache/hive/operators/test_hive_to_samba_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_hive_to_samba.py rename to tests/providers/apache/hive/operators/test_hive_to_samba_operators.py diff --git a/tests/providers/apache/hive/operators/test_mssql_to_hive.py b/tests/providers/apache/hive/operators/test_mssql_to_hive_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_mssql_to_hive.py rename to tests/providers/apache/hive/operators/test_mssql_to_hive_operators.py diff --git a/tests/providers/apache/hive/operators/test_mysql_to_hive.py b/tests/providers/apache/hive/operators/test_mysql_to_hive_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_mysql_to_hive.py rename to tests/providers/apache/hive/operators/test_mysql_to_hive_operators.py diff --git a/tests/providers/apache/hive/operators/test_s3_to_hive.py b/tests/providers/apache/hive/operators/test_s3_to_hive_operators.py similarity index 100% rename from tests/providers/apache/hive/operators/test_s3_to_hive.py rename to tests/providers/apache/hive/operators/test_s3_to_hive_operators.py diff --git a/tests/providers/apache/hive/sensors/__init__.py b/tests/providers/apache/hive/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/hive/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/hive/sensors/test_named_hive_partition.py b/tests/providers/apache/hive/sensors/test_named_hive_partition_sensors.py similarity index 100% rename from tests/providers/apache/hive/sensors/test_named_hive_partition.py rename to tests/providers/apache/hive/sensors/test_named_hive_partition_sensors.py diff --git a/tests/providers/apache/pig/__init__.py b/tests/providers/apache/pig/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/pig/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/pig/hooks/__init__.py b/tests/providers/apache/pig/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/pig/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/pig/hooks/test_pig.py b/tests/providers/apache/pig/hooks/test_pig_hooks.py similarity index 100% rename from tests/providers/apache/pig/hooks/test_pig.py rename to tests/providers/apache/pig/hooks/test_pig_hooks.py diff --git a/tests/providers/apache/pinot/__init__.py b/tests/providers/apache/pinot/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/pinot/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/pinot/hooks/__init__.py b/tests/providers/apache/pinot/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/pinot/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/pinot/hooks/test_pinot.py b/tests/providers/apache/pinot/hooks/test_pinot_hooks.py similarity index 100% rename from tests/providers/apache/pinot/hooks/test_pinot.py rename to tests/providers/apache/pinot/hooks/test_pinot_hooks.py diff --git a/tests/providers/apache/spark/__init__.py b/tests/providers/apache/spark/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/spark/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/spark/hooks/__init__.py b/tests/providers/apache/spark/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/spark/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/spark/hooks/test_spark_jdbc.py b/tests/providers/apache/spark/hooks/test_spark_jdbc_hooks.py similarity index 100% rename from tests/providers/apache/spark/hooks/test_spark_jdbc.py rename to tests/providers/apache/spark/hooks/test_spark_jdbc_hooks.py diff --git a/tests/providers/apache/spark/hooks/test_spark_sql.py b/tests/providers/apache/spark/hooks/test_spark_sql_hooks.py similarity index 100% rename from tests/providers/apache/spark/hooks/test_spark_sql.py rename to tests/providers/apache/spark/hooks/test_spark_sql_hooks.py diff --git a/tests/providers/apache/spark/hooks/test_spark_submit.py b/tests/providers/apache/spark/hooks/test_spark_submit_hooks.py similarity index 100% rename from tests/providers/apache/spark/hooks/test_spark_submit.py rename to tests/providers/apache/spark/hooks/test_spark_submit_hooks.py diff --git a/tests/providers/apache/spark/operators/__init__.py b/tests/providers/apache/spark/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/spark/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/spark/operators/test_spark_jdbc.py b/tests/providers/apache/spark/operators/test_spark_jdbc_operators.py similarity index 100% rename from tests/providers/apache/spark/operators/test_spark_jdbc.py rename to tests/providers/apache/spark/operators/test_spark_jdbc_operators.py diff --git a/tests/providers/apache/spark/operators/test_spark_sql.py b/tests/providers/apache/spark/operators/test_spark_sql_operators.py similarity index 100% rename from tests/providers/apache/spark/operators/test_spark_sql.py rename to tests/providers/apache/spark/operators/test_spark_sql_operators.py diff --git a/tests/providers/apache/spark/operators/test_spark_submit.py b/tests/providers/apache/spark/operators/test_spark_submit_operators.py similarity index 100% rename from tests/providers/apache/spark/operators/test_spark_submit.py rename to tests/providers/apache/spark/operators/test_spark_submit_operators.py diff --git a/tests/providers/apache/sqoop/__init__.py b/tests/providers/apache/sqoop/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/sqoop/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/sqoop/hooks/__init__.py b/tests/providers/apache/sqoop/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/sqoop/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/sqoop/hooks/test_sqoop.py b/tests/providers/apache/sqoop/hooks/test_sqoop_hooks.py similarity index 100% rename from tests/providers/apache/sqoop/hooks/test_sqoop.py rename to tests/providers/apache/sqoop/hooks/test_sqoop_hooks.py diff --git a/tests/providers/apache/sqoop/operators/__init__.py b/tests/providers/apache/sqoop/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/apache/sqoop/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/apache/sqoop/operators/test_sqoop.py b/tests/providers/apache/sqoop/operators/test_sqoop_operators.py similarity index 100% rename from tests/providers/apache/sqoop/operators/test_sqoop.py rename to tests/providers/apache/sqoop/operators/test_sqoop_operators.py diff --git a/tests/providers/celery/__init__.py b/tests/providers/celery/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/celery/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/celery/sensors/__init__.py b/tests/providers/celery/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/celery/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/celery/sensors/test_celery_queue.py b/tests/providers/celery/sensors/test_celery_queue_sensors.py similarity index 100% rename from tests/providers/celery/sensors/test_celery_queue.py rename to tests/providers/celery/sensors/test_celery_queue_sensors.py diff --git a/tests/providers/cloudant/__init__.py b/tests/providers/cloudant/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/cloudant/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/cloudant/hooks/__init__.py b/tests/providers/cloudant/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/cloudant/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/cloudant/hooks/test_cloudant.py b/tests/providers/cloudant/hooks/test_airflow_cloudant_hooks.py similarity index 83% rename from tests/providers/cloudant/hooks/test_cloudant.py rename to tests/providers/cloudant/hooks/test_airflow_cloudant_hooks.py index 147673da70ec6..b0df546807ad7 100644 --- a/tests/providers/cloudant/hooks/test_cloudant.py +++ b/tests/providers/cloudant/hooks/test_airflow_cloudant_hooks.py @@ -21,7 +21,7 @@ from airflow.exceptions import AirflowException from airflow.models import Connection -from airflow.providers.cloudant.hooks.cloudant import CloudantHook +from airflow.providers.cloudant.hooks.airflow_cloudant import CloudantHook class TestCloudantHook(unittest.TestCase): @@ -29,9 +29,9 @@ class TestCloudantHook(unittest.TestCase): def setUp(self): self.cloudant_hook = CloudantHook() - @patch('airflow.providers.cloudant.hooks.cloudant.CloudantHook.get_connection', + @patch('airflow.providers.cloudant.hooks.airflow_cloudant.CloudantHook.get_connection', return_value=Connection(login='user', password='password', host='account')) - @patch('airflow.providers.cloudant.hooks.cloudant.cloudant') + @patch('airflow.providers.cloudant.hooks.airflow_cloudant.cloudant') def test_get_conn(self, mock_cloudant, mock_get_connection): cloudant_session = self.cloudant_hook.get_conn() @@ -39,7 +39,7 @@ def test_get_conn(self, mock_cloudant, mock_get_connection): mock_cloudant.assert_called_once_with(user=conn.login, passwd=conn.password, account=conn.host) self.assertEqual(cloudant_session, mock_cloudant.return_value) - @patch('airflow.providers.cloudant.hooks.cloudant.CloudantHook.get_connection', + @patch('airflow.providers.cloudant.hooks.airflow_cloudant.CloudantHook.get_connection', return_value=Connection(login='user')) def test_get_conn_invalid_connection(self, mock_get_connection): with self.assertRaises(AirflowException): diff --git a/tests/providers/databricks/__init__.py b/tests/providers/databricks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/databricks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/databricks/hooks/__init__.py b/tests/providers/databricks/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/databricks/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/databricks/hooks/test_databricks.py b/tests/providers/databricks/hooks/test_databricks_hooks.py similarity index 100% rename from tests/providers/databricks/hooks/test_databricks.py rename to tests/providers/databricks/hooks/test_databricks_hooks.py diff --git a/tests/providers/databricks/operators/__init__.py b/tests/providers/databricks/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/databricks/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/databricks/operators/test_databricks.py b/tests/providers/databricks/operators/test_databricks_operators.py similarity index 100% rename from tests/providers/databricks/operators/test_databricks.py rename to tests/providers/databricks/operators/test_databricks_operators.py diff --git a/tests/providers/datadog/__init__.py b/tests/providers/datadog/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/datadog/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/datadog/hooks/__init__.py b/tests/providers/datadog/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/datadog/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/datadog/hooks/test_datadog.py b/tests/providers/datadog/hooks/test_datadog_hooks.py similarity index 100% rename from tests/providers/datadog/hooks/test_datadog.py rename to tests/providers/datadog/hooks/test_datadog_hooks.py diff --git a/tests/providers/datadog/sensors/__init__.py b/tests/providers/datadog/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/datadog/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/datadog/sensors/test_datadog.py b/tests/providers/datadog/sensors/test_airflow_datadog_sensors.py similarity index 94% rename from tests/providers/datadog/sensors/test_datadog.py rename to tests/providers/datadog/sensors/test_airflow_datadog_sensors.py index 086dbb7aa254c..2cdccf01ab0d5 100644 --- a/tests/providers/datadog/sensors/test_datadog.py +++ b/tests/providers/datadog/sensors/test_airflow_datadog_sensors.py @@ -23,7 +23,7 @@ from mock import patch from airflow.models import Connection -from airflow.providers.datadog.sensors.datadog import DatadogSensor +from airflow.providers.datadog.sensors.airflow_datadog import DatadogSensor from airflow.utils import db at_least_one_event = [{'alert_type': 'info', @@ -70,7 +70,7 @@ def setUp(self): ) @patch('airflow.providers.datadog.hooks.datadog.api.Event.query') - @patch('airflow.providers.datadog.sensors.datadog.api.Event.query') + @patch('airflow.providers.datadog.sensors.airflow_datadog.api.Event.query') def test_sensor_ok(self, api1, api2): api1.return_value = at_least_one_event api2.return_value = at_least_one_event @@ -88,7 +88,7 @@ def test_sensor_ok(self, api1, api2): self.assertTrue(sensor.poke({})) @patch('airflow.providers.datadog.hooks.datadog.api.Event.query') - @patch('airflow.providers.datadog.sensors.datadog.api.Event.query') + @patch('airflow.providers.datadog.sensors.airflow_datadog.api.Event.query') def test_sensor_fail(self, api1, api2): api1.return_value = zero_events api2.return_value = zero_events diff --git a/tests/providers/dingding/__init__.py b/tests/providers/dingding/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/dingding/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/dingding/hooks/__init__.py b/tests/providers/dingding/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/dingding/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/dingding/hooks/test_dingding.py b/tests/providers/dingding/hooks/test_dingding_hooks.py similarity index 100% rename from tests/providers/dingding/hooks/test_dingding.py rename to tests/providers/dingding/hooks/test_dingding_hooks.py diff --git a/tests/providers/dingding/operators/__init__.py b/tests/providers/dingding/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/dingding/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/dingding/operators/test_dingding.py b/tests/providers/dingding/operators/test_dingding_operators.py similarity index 100% rename from tests/providers/dingding/operators/test_dingding.py rename to tests/providers/dingding/operators/test_dingding_operators.py diff --git a/tests/providers/discord/__init__.py b/tests/providers/discord/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/discord/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/discord/hooks/__init__.py b/tests/providers/discord/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/discord/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/discord/hooks/test_discord_webhook.py b/tests/providers/discord/hooks/test_discord_webhook_hooks.py similarity index 100% rename from tests/providers/discord/hooks/test_discord_webhook.py rename to tests/providers/discord/hooks/test_discord_webhook_hooks.py diff --git a/tests/providers/discord/operators/__init__.py b/tests/providers/discord/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/discord/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/discord/operators/test_discord_webhook.py b/tests/providers/discord/operators/test_discord_webhook_operators.py similarity index 100% rename from tests/providers/discord/operators/test_discord_webhook.py rename to tests/providers/discord/operators/test_discord_webhook_operators.py diff --git a/tests/providers/docker/__init__.py b/tests/providers/docker/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/docker/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/docker/hooks/__init__.py b/tests/providers/docker/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/docker/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/docker/hooks/test_docker.py b/tests/providers/docker/hooks/test_airflow_docker_hooks.py similarity index 97% rename from tests/providers/docker/hooks/test_docker.py rename to tests/providers/docker/hooks/test_airflow_docker_hooks.py index 042b71d943f1f..883a11e701c93 100644 --- a/tests/providers/docker/hooks/test_docker.py +++ b/tests/providers/docker/hooks/test_airflow_docker_hooks.py @@ -25,12 +25,12 @@ from airflow.utils import db try: - from airflow.providers.docker.hooks.docker import DockerHook + from airflow.providers.docker.hooks.airflow_docker import DockerHook except ImportError: pass -@mock.patch('airflow.providers.docker.hooks.docker.APIClient', autospec=True) +@mock.patch('airflow.providers.docker.hooks.airflow_docker.APIClient', autospec=True) class TestDockerHook(unittest.TestCase): def setUp(self): db.merge_conn( diff --git a/tests/providers/docker/operators/__init__.py b/tests/providers/docker/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/docker/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/docker/operators/test_docker.py b/tests/providers/docker/operators/test_docker_operator_operators.py similarity index 91% rename from tests/providers/docker/operators/test_docker.py rename to tests/providers/docker/operators/test_docker_operator_operators.py index 89ecad372bbfa..cdf243439b29e 100644 --- a/tests/providers/docker/operators/test_docker.py +++ b/tests/providers/docker/operators/test_docker_operator_operators.py @@ -20,20 +20,16 @@ import unittest import mock +from docker import APIClient from airflow.exceptions import AirflowException - -try: - from airflow.providers.docker.operators.docker import DockerOperator - from airflow.providers.docker.hooks.docker import DockerHook - from docker import APIClient -except ImportError: - pass +from airflow.providers.docker.hooks.airflow_docker import DockerHook +from airflow.providers.docker.operators.docker_operator import DockerOperator class TestDockerOperator(unittest.TestCase): - @mock.patch('airflow.providers.docker.operators.docker.TemporaryDirectory') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.TemporaryDirectory') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute(self, client_class_mock, tempdir_mock): host_config = mock.Mock() tempdir_mock.return_value.__enter__.return_value = '/mkdtemp' @@ -88,8 +84,8 @@ def test_execute(self, client_class_mock, tempdir_mock): client_mock.pull.assert_called_once_with('ubuntu:latest', stream=True) client_mock.wait.assert_called_once_with('some_id') - @mock.patch('airflow.providers.docker.operators.docker.tls.TLSConfig') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.tls.TLSConfig') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_tls(self, client_class_mock, tls_class_mock): client_mock = mock.Mock(spec=APIClient) client_mock.create_container.return_value = {'Id': 'some_id'} @@ -115,7 +111,7 @@ def test_execute_tls(self, client_class_mock, tls_class_mock): client_class_mock.assert_called_once_with(base_url='https://127.0.0.1:2376', tls=tls_mock, version=None) - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_unicode_logs(self, client_class_mock): client_mock = mock.Mock(spec=APIClient) client_mock.create_container.return_value = {'Id': 'some_id'} @@ -137,7 +133,7 @@ def test_execute_unicode_logs(self, client_class_mock): logging.raiseExceptions = originalRaiseExceptions print_exception_mock.assert_not_called() - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_container_fails(self, client_class_mock): client_mock = mock.Mock(spec=APIClient) client_mock.create_container.return_value = {'Id': 'some_id'} @@ -166,7 +162,7 @@ def test_on_kill(): client_mock.stop.assert_called_once_with('some_id') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_no_docker_conn_id_no_hook(self, operator_client_mock): # Mock out a Docker client, so operations don't raise errors client_mock = mock.Mock(name='DockerOperator.APIClient mock', spec=APIClient) @@ -199,8 +195,8 @@ def test_execute_no_docker_conn_id_no_hook(self, operator_client_mock): 'Hook called though no docker_conn_id configured' ) - @mock.patch('airflow.providers.docker.operators.docker.DockerHook') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.DockerHook') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_with_docker_conn_id_use_hook(self, operator_client_mock, operator_docker_hook): # Mock out a Docker client, so operations don't raise errors @@ -240,8 +236,8 @@ def test_execute_with_docker_conn_id_use_hook(self, operator_client_mock, 'Image was not pulled using operator client' ) - @mock.patch('airflow.providers.docker.operators.docker.TemporaryDirectory') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.TemporaryDirectory') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') def test_execute_xcom_behavior(self, client_class_mock, tempdir_mock): tempdir_mock.return_value.__enter__.return_value = '/mkdtemp' diff --git a/tests/providers/docker/operators/test_docker_swarm.py b/tests/providers/docker/operators/test_docker_swarm_operators.py similarity index 96% rename from tests/providers/docker/operators/test_docker_swarm.py rename to tests/providers/docker/operators/test_docker_swarm_operators.py index e4cb6df351339..bf3be6a8d1a82 100644 --- a/tests/providers/docker/operators/test_docker_swarm.py +++ b/tests/providers/docker/operators/test_docker_swarm_operators.py @@ -27,7 +27,7 @@ class TestDockerSwarmOperator(unittest.TestCase): - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') @mock.patch('airflow.providers.docker.operators.docker_swarm.types') def test_execute(self, types_mock, client_class_mock): @@ -80,7 +80,7 @@ def _client_tasks_side_effect(): self.assertEqual(client_mock.tasks.call_count, 3) client_mock.remove_service.assert_called_once_with('some_id') - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') @mock.patch('airflow.providers.docker.operators.docker_swarm.types') def test_no_auto_remove(self, types_mock, client_class_mock): @@ -106,7 +106,7 @@ def test_no_auto_remove(self, types_mock, client_class_mock): 'Docker service being removed even when `auto_remove` set to `False`' ) - @mock.patch('airflow.providers.docker.operators.docker.APIClient') + @mock.patch('airflow.providers.docker.operators.docker_operator.APIClient') @mock.patch('airflow.providers.docker.operators.docker_swarm.types') def test_failed_service_raises_error(self, types_mock, client_class_mock): diff --git a/tests/providers/email/__init__.py b/tests/providers/email/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/email/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/email/operators/__init__.py b/tests/providers/email/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/email/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/email/operators/test_email.py b/tests/providers/email/operators/test_email_operators.py similarity index 88% rename from tests/providers/email/operators/test_email.py rename to tests/providers/email/operators/test_email_operators.py index 13c5e1c83c477..89b85a92c4dd5 100644 --- a/tests/providers/email/operators/test_email.py +++ b/tests/providers/email/operators/test_email_operators.py @@ -18,20 +18,18 @@ import datetime import unittest -from unittest import mock from airflow import DAG from airflow.providers.email.operators.email import EmailOperator from airflow.utils import timezone from tests.test_utils.config import conf_vars +from tests.test_utils.mock_mail import send_email_test DEFAULT_DATE = timezone.datetime(2016, 1, 1) END_DATE = timezone.datetime(2016, 1, 2) INTERVAL = datetime.timedelta(hours=12) FROZEN_NOW = timezone.datetime(2016, 1, 2, 12, 1, 1) -send_email_test = mock.Mock() - class TestEmailOperator(unittest.TestCase): @@ -57,7 +55,8 @@ def _run_as_operator(self, **kwargs): def test_execute(self): with conf_vars( - {('email', 'email_backend'): 'tests.providers.email.operators.test_email.send_email_test'} + {('email', 'email_backend'): + 'tests.test_utils.mock_mail.send_email_test'} ): self._run_as_operator() - assert send_email_test.call_count == 1 + assert send_email_test.call_count == 1, "The send test email method should be called" diff --git a/tests/providers/ftp/__init__.py b/tests/providers/ftp/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ftp/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ftp/hooks/__init__.py b/tests/providers/ftp/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ftp/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ftp/hooks/test_ftp.py b/tests/providers/ftp/hooks/test_ftp_hooks.py similarity index 100% rename from tests/providers/ftp/hooks/test_ftp.py rename to tests/providers/ftp/hooks/test_ftp_hooks.py diff --git a/tests/providers/ftp/sensors/__init__.py b/tests/providers/ftp/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ftp/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ftp/sensors/test_ftp.py b/tests/providers/ftp/sensors/test_ftp_sensors.py similarity index 100% rename from tests/providers/ftp/sensors/test_ftp.py rename to tests/providers/ftp/sensors/test_ftp_sensors.py diff --git a/tests/providers/google/__init__.py b/tests/providers/google/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/cloud/__init__.py b/tests/providers/google/cloud/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/cloud/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/cloud/hooks/__init__.py b/tests/providers/google/cloud/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/cloud/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/cloud/hooks/test_automl.py b/tests/providers/google/cloud/hooks/test_automl_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_automl.py rename to tests/providers/google/cloud/hooks/test_automl_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_base.py b/tests/providers/google/cloud/hooks/test_base_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_base.py rename to tests/providers/google/cloud/hooks/test_base_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_bigquery_system.py b/tests/providers/google/cloud/hooks/test_bigquery_dataframe_system.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_bigquery_system.py rename to tests/providers/google/cloud/hooks/test_bigquery_dataframe_system.py diff --git a/tests/providers/google/cloud/hooks/test_bigquery_dts.py b/tests/providers/google/cloud/hooks/test_bigquery_dts_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_bigquery_dts.py rename to tests/providers/google/cloud/hooks/test_bigquery_dts_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_bigquery.py b/tests/providers/google/cloud/hooks/test_bigquery_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_bigquery.py rename to tests/providers/google/cloud/hooks/test_bigquery_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_bigtable.py b/tests/providers/google/cloud/hooks/test_bigtable_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_bigtable.py rename to tests/providers/google/cloud/hooks/test_bigtable_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_cloud_build.py b/tests/providers/google/cloud/hooks/test_cloud_build_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_cloud_build.py rename to tests/providers/google/cloud/hooks/test_cloud_build_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_cloud_memorystore.py b/tests/providers/google/cloud/hooks/test_cloud_memorystore_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_cloud_memorystore.py rename to tests/providers/google/cloud/hooks/test_cloud_memorystore_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_cloud_sql.py b/tests/providers/google/cloud/hooks/test_cloud_sql_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_cloud_sql.py rename to tests/providers/google/cloud/hooks/test_cloud_sql_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_cloud_storage_transfer_service.py b/tests/providers/google/cloud/hooks/test_cloud_storage_transfer_service_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_cloud_storage_transfer_service.py rename to tests/providers/google/cloud/hooks/test_cloud_storage_transfer_service_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_compute.py b/tests/providers/google/cloud/hooks/test_compute_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_compute.py rename to tests/providers/google/cloud/hooks/test_compute_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_dataflow.py b/tests/providers/google/cloud/hooks/test_dataflow_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_dataflow.py rename to tests/providers/google/cloud/hooks/test_dataflow_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_dataproc.py b/tests/providers/google/cloud/hooks/test_dataproc_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_dataproc.py rename to tests/providers/google/cloud/hooks/test_dataproc_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_datastore.py b/tests/providers/google/cloud/hooks/test_datastore_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_datastore.py rename to tests/providers/google/cloud/hooks/test_datastore_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_discovery_api.py b/tests/providers/google/cloud/hooks/test_discovery_api_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_discovery_api.py rename to tests/providers/google/cloud/hooks/test_discovery_api_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_dlp.py b/tests/providers/google/cloud/hooks/test_dlp_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_dlp.py rename to tests/providers/google/cloud/hooks/test_dlp_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_functions.py b/tests/providers/google/cloud/hooks/test_functions_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_functions.py rename to tests/providers/google/cloud/hooks/test_functions_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_gcs.py b/tests/providers/google/cloud/hooks/test_gcs_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_gcs.py rename to tests/providers/google/cloud/hooks/test_gcs_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_kms.py b/tests/providers/google/cloud/hooks/test_kms_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_kms.py rename to tests/providers/google/cloud/hooks/test_kms_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_kubernetes_engine.py b/tests/providers/google/cloud/hooks/test_kubernetes_engine_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_kubernetes_engine.py rename to tests/providers/google/cloud/hooks/test_kubernetes_engine_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_mlengine.py b/tests/providers/google/cloud/hooks/test_mlengine_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_mlengine.py rename to tests/providers/google/cloud/hooks/test_mlengine_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_natural_language.py b/tests/providers/google/cloud/hooks/test_natural_language_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_natural_language.py rename to tests/providers/google/cloud/hooks/test_natural_language_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_pubsub.py b/tests/providers/google/cloud/hooks/test_pubsub_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_pubsub.py rename to tests/providers/google/cloud/hooks/test_pubsub_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_spanner.py b/tests/providers/google/cloud/hooks/test_spanner_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_spanner.py rename to tests/providers/google/cloud/hooks/test_spanner_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_speech_to_text.py b/tests/providers/google/cloud/hooks/test_speech_to_text_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_speech_to_text.py rename to tests/providers/google/cloud/hooks/test_speech_to_text_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_tasks.py b/tests/providers/google/cloud/hooks/test_tasks_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_tasks.py rename to tests/providers/google/cloud/hooks/test_tasks_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_text_to_speech.py b/tests/providers/google/cloud/hooks/test_text_to_speech_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_text_to_speech.py rename to tests/providers/google/cloud/hooks/test_text_to_speech_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_translate.py b/tests/providers/google/cloud/hooks/test_translate_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_translate.py rename to tests/providers/google/cloud/hooks/test_translate_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_video_intelligence.py b/tests/providers/google/cloud/hooks/test_video_intelligence_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_video_intelligence.py rename to tests/providers/google/cloud/hooks/test_video_intelligence_hooks.py diff --git a/tests/providers/google/cloud/hooks/test_vision.py b/tests/providers/google/cloud/hooks/test_vision_hooks.py similarity index 100% rename from tests/providers/google/cloud/hooks/test_vision.py rename to tests/providers/google/cloud/hooks/test_vision_hooks.py diff --git a/tests/providers/google/cloud/operators/__init__.py b/tests/providers/google/cloud/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/cloud/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/cloud/operators/test_adls_to_gcs.py b/tests/providers/google/cloud/operators/test_adls_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_adls_to_gcs.py rename to tests/providers/google/cloud/operators/test_adls_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_automl.py b/tests/providers/google/cloud/operators/test_automl_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_automl.py rename to tests/providers/google/cloud/operators/test_automl_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigquery_dts.py b/tests/providers/google/cloud/operators/test_bigquery_dts_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigquery_dts.py rename to tests/providers/google/cloud/operators/test_bigquery_dts_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigquery.py b/tests/providers/google/cloud/operators/test_bigquery_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigquery.py rename to tests/providers/google/cloud/operators/test_bigquery_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigquery_to_bigquery.py b/tests/providers/google/cloud/operators/test_bigquery_to_bigquery_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigquery_to_bigquery.py rename to tests/providers/google/cloud/operators/test_bigquery_to_bigquery_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigquery_to_gcs.py b/tests/providers/google/cloud/operators/test_bigquery_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigquery_to_gcs.py rename to tests/providers/google/cloud/operators/test_bigquery_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigquery_to_mysql.py b/tests/providers/google/cloud/operators/test_bigquery_to_mysql_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigquery_to_mysql.py rename to tests/providers/google/cloud/operators/test_bigquery_to_mysql_operators.py diff --git a/tests/providers/google/cloud/operators/test_bigtable.py b/tests/providers/google/cloud/operators/test_bigtable_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_bigtable.py rename to tests/providers/google/cloud/operators/test_bigtable_operators.py diff --git a/tests/providers/google/cloud/operators/test_cassandra_to_gcs.py b/tests/providers/google/cloud/operators/test_cassandra_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_cassandra_to_gcs.py rename to tests/providers/google/cloud/operators/test_cassandra_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_cloud_build.py b/tests/providers/google/cloud/operators/test_cloud_build_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_cloud_build.py rename to tests/providers/google/cloud/operators/test_cloud_build_operators.py diff --git a/tests/providers/google/cloud/operators/test_cloud_memorystore.py b/tests/providers/google/cloud/operators/test_cloud_memorystore_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_cloud_memorystore.py rename to tests/providers/google/cloud/operators/test_cloud_memorystore_operators.py diff --git a/tests/providers/google/cloud/operators/test_cloud_sql.py b/tests/providers/google/cloud/operators/test_cloud_sql_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_cloud_sql.py rename to tests/providers/google/cloud/operators/test_cloud_sql_operators.py diff --git a/tests/providers/google/cloud/operators/test_cloud_storage_transfer_service.py b/tests/providers/google/cloud/operators/test_cloud_storage_transfer_service_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_cloud_storage_transfer_service.py rename to tests/providers/google/cloud/operators/test_cloud_storage_transfer_service_operators.py diff --git a/tests/providers/google/cloud/operators/test_compute.py b/tests/providers/google/cloud/operators/test_compute_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_compute.py rename to tests/providers/google/cloud/operators/test_compute_operators.py diff --git a/tests/providers/google/cloud/operators/test_dataflow.py b/tests/providers/google/cloud/operators/test_dataflow_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_dataflow.py rename to tests/providers/google/cloud/operators/test_dataflow_operators.py diff --git a/tests/providers/google/cloud/operators/test_dataproc.py b/tests/providers/google/cloud/operators/test_dataproc_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_dataproc.py rename to tests/providers/google/cloud/operators/test_dataproc_operators.py diff --git a/tests/providers/google/cloud/operators/test_dlp.py b/tests/providers/google/cloud/operators/test_dlp_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_dlp.py rename to tests/providers/google/cloud/operators/test_dlp_operators.py diff --git a/tests/providers/google/cloud/operators/test_functions.py b/tests/providers/google/cloud/operators/test_functions_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_functions.py rename to tests/providers/google/cloud/operators/test_functions_operators.py diff --git a/tests/providers/google/cloud/operators/test_gcs.py b/tests/providers/google/cloud/operators/test_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_gcs.py rename to tests/providers/google/cloud/operators/test_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_gcs_to_gcs.py b/tests/providers/google/cloud/operators/test_gcs_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_gcs_to_gcs.py rename to tests/providers/google/cloud/operators/test_gcs_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_gcs_to_sftp.py b/tests/providers/google/cloud/operators/test_gcs_to_sftp_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_gcs_to_sftp.py rename to tests/providers/google/cloud/operators/test_gcs_to_sftp_operators.py diff --git a/tests/providers/google/cloud/operators/test_kubernetes_engine.py b/tests/providers/google/cloud/operators/test_kubernetes_engine_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_kubernetes_engine.py rename to tests/providers/google/cloud/operators/test_kubernetes_engine_operators.py diff --git a/tests/providers/google/cloud/operators/test_local_to_gcs.py b/tests/providers/google/cloud/operators/test_local_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_local_to_gcs.py rename to tests/providers/google/cloud/operators/test_local_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_mlengine.py b/tests/providers/google/cloud/operators/test_mlengine_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_mlengine.py rename to tests/providers/google/cloud/operators/test_mlengine_operators.py diff --git a/tests/providers/google/cloud/operators/test_mlengine_utils.py b/tests/providers/google/cloud/operators/test_mlengine_utils_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_mlengine_utils.py rename to tests/providers/google/cloud/operators/test_mlengine_utils_operators.py diff --git a/tests/providers/google/cloud/operators/test_mssql_to_gcs.py b/tests/providers/google/cloud/operators/test_mssql_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_mssql_to_gcs.py rename to tests/providers/google/cloud/operators/test_mssql_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_mysql_to_gcs.py b/tests/providers/google/cloud/operators/test_mysql_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_mysql_to_gcs.py rename to tests/providers/google/cloud/operators/test_mysql_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_natural_language.py b/tests/providers/google/cloud/operators/test_natural_language_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_natural_language.py rename to tests/providers/google/cloud/operators/test_natural_language_operators.py diff --git a/tests/providers/google/cloud/operators/test_postgres_to_gcs.py b/tests/providers/google/cloud/operators/test_postgres_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_postgres_to_gcs.py rename to tests/providers/google/cloud/operators/test_postgres_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_pubsub.py b/tests/providers/google/cloud/operators/test_pubsub_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_pubsub.py rename to tests/providers/google/cloud/operators/test_pubsub_operators.py diff --git a/tests/providers/google/cloud/operators/test_s3_to_gcs.py b/tests/providers/google/cloud/operators/test_s3_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_s3_to_gcs.py rename to tests/providers/google/cloud/operators/test_s3_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_sftp_to_gcs.py b/tests/providers/google/cloud/operators/test_sftp_to_gcs_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_sftp_to_gcs.py rename to tests/providers/google/cloud/operators/test_sftp_to_gcs_operators.py diff --git a/tests/providers/google/cloud/operators/test_spanner.py b/tests/providers/google/cloud/operators/test_spanner_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_spanner.py rename to tests/providers/google/cloud/operators/test_spanner_operators.py diff --git a/tests/providers/google/cloud/operators/test_speech_to_text.py b/tests/providers/google/cloud/operators/test_speech_to_text_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_speech_to_text.py rename to tests/providers/google/cloud/operators/test_speech_to_text_operators.py diff --git a/tests/providers/google/cloud/operators/test_tasks.py b/tests/providers/google/cloud/operators/test_tasks_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_tasks.py rename to tests/providers/google/cloud/operators/test_tasks_operators.py diff --git a/tests/providers/google/cloud/operators/test_text_to_speech.py b/tests/providers/google/cloud/operators/test_text_to_speech_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_text_to_speech.py rename to tests/providers/google/cloud/operators/test_text_to_speech_operators.py diff --git a/tests/providers/google/cloud/operators/test_translate.py b/tests/providers/google/cloud/operators/test_translate_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_translate.py rename to tests/providers/google/cloud/operators/test_translate_operators.py diff --git a/tests/providers/google/cloud/operators/test_translate_speech.py b/tests/providers/google/cloud/operators/test_translate_speech_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_translate_speech.py rename to tests/providers/google/cloud/operators/test_translate_speech_operators.py diff --git a/tests/providers/google/cloud/operators/test_video_intelligence.py b/tests/providers/google/cloud/operators/test_video_intelligence_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_video_intelligence.py rename to tests/providers/google/cloud/operators/test_video_intelligence_operators.py diff --git a/tests/providers/google/cloud/operators/test_vision.py b/tests/providers/google/cloud/operators/test_vision_operators.py similarity index 100% rename from tests/providers/google/cloud/operators/test_vision.py rename to tests/providers/google/cloud/operators/test_vision_operators.py diff --git a/tests/providers/google/cloud/sensors/__init__.py b/tests/providers/google/cloud/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/cloud/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/cloud/sensors/test_bigquery_dts.py b/tests/providers/google/cloud/sensors/test_bigquery_dts_sensors.py similarity index 100% rename from tests/providers/google/cloud/sensors/test_bigquery_dts.py rename to tests/providers/google/cloud/sensors/test_bigquery_dts_sensors.py diff --git a/tests/providers/google/cloud/sensors/test_bigtable.py b/tests/providers/google/cloud/sensors/test_bigtable_sensors.py similarity index 100% rename from tests/providers/google/cloud/sensors/test_bigtable.py rename to tests/providers/google/cloud/sensors/test_bigtable_sensors.py diff --git a/tests/providers/google/cloud/sensors/test_cloud_storage_transfer_service.py b/tests/providers/google/cloud/sensors/test_cloud_storage_transfer_service_sensors.py similarity index 100% rename from tests/providers/google/cloud/sensors/test_cloud_storage_transfer_service.py rename to tests/providers/google/cloud/sensors/test_cloud_storage_transfer_service_sensors.py diff --git a/tests/providers/google/cloud/sensors/test_gcs.py b/tests/providers/google/cloud/sensors/test_gcs_sensors.py similarity index 100% rename from tests/providers/google/cloud/sensors/test_gcs.py rename to tests/providers/google/cloud/sensors/test_gcs_sensors.py diff --git a/tests/providers/google/cloud/sensors/test_pubsub.py b/tests/providers/google/cloud/sensors/test_pubsub_sensors.py similarity index 100% rename from tests/providers/google/cloud/sensors/test_pubsub.py rename to tests/providers/google/cloud/sensors/test_pubsub_sensors.py diff --git a/tests/providers/google/cloud/utils/__init__.py b/tests/providers/google/cloud/utils/__init__.py deleted file mode 100644 index fe95886d5c104..0000000000000 --- a/tests/providers/google/cloud/utils/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 -# -# 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. -# diff --git a/tests/providers/google/marketing_platform/__init__.py b/tests/providers/google/marketing_platform/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/marketing_platform/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/marketing_platform/hooks/__init__.py b/tests/providers/google/marketing_platform/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/marketing_platform/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/marketing_platform/hooks/test_campaign_manager.py b/tests/providers/google/marketing_platform/hooks/test_campaign_manager_hooks.py similarity index 100% rename from tests/providers/google/marketing_platform/hooks/test_campaign_manager.py rename to tests/providers/google/marketing_platform/hooks/test_campaign_manager_hooks.py diff --git a/tests/providers/google/marketing_platform/hooks/test_display_video.py b/tests/providers/google/marketing_platform/hooks/test_display_video_hooks.py similarity index 100% rename from tests/providers/google/marketing_platform/hooks/test_display_video.py rename to tests/providers/google/marketing_platform/hooks/test_display_video_hooks.py diff --git a/tests/providers/google/marketing_platform/hooks/test_search_ads.py b/tests/providers/google/marketing_platform/hooks/test_search_ads_hooks.py similarity index 100% rename from tests/providers/google/marketing_platform/hooks/test_search_ads.py rename to tests/providers/google/marketing_platform/hooks/test_search_ads_hooks.py diff --git a/tests/providers/google/marketing_platform/operators/__init__.py b/tests/providers/google/marketing_platform/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/marketing_platform/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/marketing_platform/operators/test_campaign_manager.py b/tests/providers/google/marketing_platform/operators/test_campaign_manager_operators.py similarity index 100% rename from tests/providers/google/marketing_platform/operators/test_campaign_manager.py rename to tests/providers/google/marketing_platform/operators/test_campaign_manager_operators.py diff --git a/tests/providers/google/marketing_platform/operators/test_display_video.py b/tests/providers/google/marketing_platform/operators/test_display_video_operators.py similarity index 100% rename from tests/providers/google/marketing_platform/operators/test_display_video.py rename to tests/providers/google/marketing_platform/operators/test_display_video_operators.py diff --git a/tests/providers/google/marketing_platform/operators/test_search_ads.py b/tests/providers/google/marketing_platform/operators/test_search_ads_operators.py similarity index 100% rename from tests/providers/google/marketing_platform/operators/test_search_ads.py rename to tests/providers/google/marketing_platform/operators/test_search_ads_operators.py diff --git a/tests/providers/google/marketing_platform/sensors/__init__.py b/tests/providers/google/marketing_platform/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/google/marketing_platform/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/google/marketing_platform/sensors/test_campaign_manager.py b/tests/providers/google/marketing_platform/sensors/test_campaign_manager_sensors.py similarity index 100% rename from tests/providers/google/marketing_platform/sensors/test_campaign_manager.py rename to tests/providers/google/marketing_platform/sensors/test_campaign_manager_sensors.py diff --git a/tests/providers/google/marketing_platform/sensors/test_display_video.py b/tests/providers/google/marketing_platform/sensors/test_display_video_sensors.py similarity index 100% rename from tests/providers/google/marketing_platform/sensors/test_display_video.py rename to tests/providers/google/marketing_platform/sensors/test_display_video_sensors.py diff --git a/tests/providers/google/marketing_platform/sensors/test_search_ads.py b/tests/providers/google/marketing_platform/sensors/test_search_ads_sensors.py similarity index 100% rename from tests/providers/google/marketing_platform/sensors/test_search_ads.py rename to tests/providers/google/marketing_platform/sensors/test_search_ads_sensors.py diff --git a/tests/providers/google/suite/__init__.py b/tests/providers/google/suite/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/google/suite/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/google/suite/hooks/__init__.py b/tests/providers/google/suite/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/google/suite/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/google/suite/hooks/test_drive.py b/tests/providers/google/suite/hooks/test_drive_hooks.py similarity index 100% rename from tests/providers/google/suite/hooks/test_drive.py rename to tests/providers/google/suite/hooks/test_drive_hooks.py diff --git a/tests/providers/google/suite/hooks/test_sheets.py b/tests/providers/google/suite/hooks/test_sheets_hooks.py similarity index 100% rename from tests/providers/google/suite/hooks/test_sheets.py rename to tests/providers/google/suite/hooks/test_sheets_hooks.py diff --git a/tests/providers/google/suite/operators/__init__.py b/tests/providers/google/suite/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/google/suite/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/google/suite/operators/test_gcs_to_gdrive_operator.py b/tests/providers/google/suite/operators/test_gcs_to_gdrive_operator_operators.py similarity index 100% rename from tests/providers/google/suite/operators/test_gcs_to_gdrive_operator.py rename to tests/providers/google/suite/operators/test_gcs_to_gdrive_operator_operators.py diff --git a/tests/providers/grpc/__init__.py b/tests/providers/grpc/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/grpc/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/grpc/hooks/__init__.py b/tests/providers/grpc/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/grpc/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/grpc/hooks/test_grpc.py b/tests/providers/grpc/hooks/test_airflow_grpc_hooks.py similarity index 97% rename from tests/providers/grpc/hooks/test_grpc.py rename to tests/providers/grpc/hooks/test_airflow_grpc_hooks.py index 6290338dfa92c..d49bd11450e74 100644 --- a/tests/providers/grpc/hooks/test_grpc.py +++ b/tests/providers/grpc/hooks/test_airflow_grpc_hooks.py @@ -22,7 +22,7 @@ from airflow.exceptions import AirflowConfigException from airflow.models import Connection -from airflow.providers.grpc.hooks.grpc import GrpcHook +from airflow.providers.grpc.hooks.airflow_grpc import GrpcHook def get_airflow_connection(auth_type="NO_AUTH", credential_pem_file=None, scopes=None): @@ -103,7 +103,7 @@ def test_connection_with_port(self, mock_get_connection, mock_insecure_channel): mock_insecure_channel.assert_called_once_with(expected_url) self.assertEqual(channel, mocked_channel) - @mock.patch('airflow.providers.grpc.hooks.grpc.open') + @mock.patch('airflow.providers.grpc.hooks.airflow_grpc.open') @mock.patch('airflow.hooks.base_hook.BaseHook.get_connection') @mock.patch('grpc.ssl_channel_credentials') @mock.patch('grpc.secure_channel') @@ -135,7 +135,7 @@ def test_connection_with_ssl(self, ) self.assertEqual(channel, mocked_channel) - @mock.patch('airflow.providers.grpc.hooks.grpc.open') + @mock.patch('airflow.providers.grpc.hooks.airflow_grpc.open') @mock.patch('airflow.hooks.base_hook.BaseHook.get_connection') @mock.patch('grpc.ssl_channel_credentials') @mock.patch('grpc.secure_channel') @@ -279,7 +279,7 @@ def test_connection_with_interceptors(self, mock_intercept_channel.assert_called_once_with(mocked_channel, "test1") @mock.patch('airflow.hooks.base_hook.BaseHook.get_connection') - @mock.patch('airflow.providers.grpc.hooks.grpc.GrpcHook.get_conn') + @mock.patch('airflow.providers.grpc.hooks.airflow_grpc.GrpcHook.get_conn') def test_simple_run(self, mock_get_conn, mock_get_connection): conn = get_airflow_connection() mock_get_connection.return_value = conn @@ -294,7 +294,7 @@ def test_simple_run(self, mock_get_conn, mock_get_connection): self.assertEqual(next(response), "hello") @mock.patch('airflow.hooks.base_hook.BaseHook.get_connection') - @mock.patch('airflow.providers.grpc.hooks.grpc.GrpcHook.get_conn') + @mock.patch('airflow.providers.grpc.hooks.airflow_grpc.GrpcHook.get_conn') def test_stream_run(self, mock_get_conn, mock_get_connection): conn = get_airflow_connection() mock_get_connection.return_value = conn diff --git a/tests/providers/grpc/operators/__init__.py b/tests/providers/grpc/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/grpc/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/grpc/operators/test_grpc.py b/tests/providers/grpc/operators/test_airflow_grpc_operators.py similarity index 90% rename from tests/providers/grpc/operators/test_grpc.py rename to tests/providers/grpc/operators/test_airflow_grpc_operators.py index 292e2ca4c8335..f0e3b7e64f5a3 100644 --- a/tests/providers/grpc/operators/test_grpc.py +++ b/tests/providers/grpc/operators/test_airflow_grpc_operators.py @@ -19,7 +19,7 @@ import mock -from airflow.providers.grpc.operators.grpc import GrpcOperator +from airflow.providers.grpc.operators.airflow_grpc import GrpcOperator class StubClass: @@ -34,7 +34,7 @@ class TestGrpcOperator(unittest.TestCase): def custom_conn_func(self, connection): pass - @mock.patch('airflow.providers.grpc.operators.grpc.GrpcHook') + @mock.patch('airflow.providers.grpc.operators.airflow_grpc.GrpcHook') def test_with_interceptors(self, mock_hook): operator = GrpcOperator( stub_class=StubClass, @@ -46,7 +46,7 @@ def test_with_interceptors(self, mock_hook): operator.execute({}) mock_hook.assert_called_once_with("grpc_default", interceptors=[], custom_connection_func=None) - @mock.patch('airflow.providers.grpc.operators.grpc.GrpcHook') + @mock.patch('airflow.providers.grpc.operators.airflow_grpc.GrpcHook') def test_with_custom_connection_func(self, mock_hook): operator = GrpcOperator( stub_class=StubClass, @@ -59,7 +59,7 @@ def test_with_custom_connection_func(self, mock_hook): mock_hook.assert_called_once_with( "grpc_default", interceptors=None, custom_connection_func=self.custom_conn_func) - @mock.patch('airflow.providers.grpc.operators.grpc.GrpcHook') + @mock.patch('airflow.providers.grpc.operators.airflow_grpc.GrpcHook') def test_execute_with_log(self, mock_hook): mocked_hook = mock.Mock() mock_hook.return_value = mocked_hook @@ -80,7 +80,7 @@ def test_execute_with_log(self, mock_hook): mock_info.assert_any_call("'value1'") mock_info.assert_any_call("'value2'") - @mock.patch('airflow.providers.grpc.operators.grpc.GrpcHook') + @mock.patch('airflow.providers.grpc.operators.airflow_grpc.GrpcHook') def test_execute_with_callback(self, mock_hook): mocked_hook = mock.Mock() callback = mock.Mock() diff --git a/tests/providers/http/__init__.py b/tests/providers/http/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/http/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/http/hooks/__init__.py b/tests/providers/http/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/http/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/http/hooks/test_http.py b/tests/providers/http/hooks/test_http_hooks.py similarity index 100% rename from tests/providers/http/hooks/test_http.py rename to tests/providers/http/hooks/test_http_hooks.py diff --git a/tests/providers/http/operators/__init__.py b/tests/providers/http/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/http/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/http/operators/test_http.py b/tests/providers/http/operators/test_http_operators.py similarity index 100% rename from tests/providers/http/operators/test_http.py rename to tests/providers/http/operators/test_http_operators.py diff --git a/tests/providers/http/sensors/__init__.py b/tests/providers/http/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/http/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/http/sensors/test_http.py b/tests/providers/http/sensors/test_http_sensors.py similarity index 100% rename from tests/providers/http/sensors/test_http.py rename to tests/providers/http/sensors/test_http_sensors.py diff --git a/tests/providers/imap/__init__.py b/tests/providers/imap/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/imap/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/imap/hooks/__init__.py b/tests/providers/imap/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/imap/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/imap/hooks/test_imap.py b/tests/providers/imap/hooks/test_imap_hooks.py similarity index 100% rename from tests/providers/imap/hooks/test_imap.py rename to tests/providers/imap/hooks/test_imap_hooks.py diff --git a/tests/providers/imap/sensors/__init__.py b/tests/providers/imap/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/imap/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/imap/sensors/test_imap_attachment.py b/tests/providers/imap/sensors/test_imap_attachment_sensors.py similarity index 100% rename from tests/providers/imap/sensors/test_imap_attachment.py rename to tests/providers/imap/sensors/test_imap_attachment_sensors.py diff --git a/tests/providers/jdbc/__init__.py b/tests/providers/jdbc/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/jdbc/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/jdbc/hooks/__init__.py b/tests/providers/jdbc/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/jdbc/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/jdbc/hooks/test_jdbc.py b/tests/providers/jdbc/hooks/test_jdbc_hooks.py similarity index 100% rename from tests/providers/jdbc/hooks/test_jdbc.py rename to tests/providers/jdbc/hooks/test_jdbc_hooks.py diff --git a/tests/providers/jdbc/operators/__init__.py b/tests/providers/jdbc/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/jdbc/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/jdbc/operators/test_jdbc.py b/tests/providers/jdbc/operators/test_jdbc_operators.py similarity index 100% rename from tests/providers/jdbc/operators/test_jdbc.py rename to tests/providers/jdbc/operators/test_jdbc_operators.py diff --git a/tests/providers/jenkins/__init__.py b/tests/providers/jenkins/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/jenkins/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/jenkins/operators/__init__.py b/tests/providers/jenkins/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/jenkins/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/jenkins/operators/test_jenkins_job_trigger.py b/tests/providers/jenkins/operators/test_jenkins_job_trigger_operators.py similarity index 100% rename from tests/providers/jenkins/operators/test_jenkins_job_trigger.py rename to tests/providers/jenkins/operators/test_jenkins_job_trigger_operators.py diff --git a/tests/providers/jira/__init__.py b/tests/providers/jira/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/jira/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/jira/hooks/__init__.py b/tests/providers/jira/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/jira/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/jira/hooks/test_jira.py b/tests/providers/jira/hooks/test_airflow_jira_hooks.py similarity index 92% rename from tests/providers/jira/hooks/test_jira.py rename to tests/providers/jira/hooks/test_airflow_jira_hooks.py index e88c2f52ec38b..138d42f489eac 100644 --- a/tests/providers/jira/hooks/test_jira.py +++ b/tests/providers/jira/hooks/test_airflow_jira_hooks.py @@ -21,7 +21,7 @@ from unittest.mock import Mock, patch from airflow.models import Connection -from airflow.providers.jira.hooks.jira import JiraHook +from airflow.providers.jira.hooks.airflow_jira import JiraHook from airflow.utils import db jira_client_mock = Mock( @@ -37,7 +37,7 @@ def setUp(self): host='https://localhost/jira/', port=443, extra='{"verify": "False", "project": "AIRFLOW"}')) - @patch("airflow.providers.jira.hooks.jira.JIRA", autospec=True, + @patch("airflow.providers.jira.hooks.airflow_jira.JIRA", autospec=True, return_value=jira_client_mock) def test_jira_client_connection(self, jira_mock): jira_hook = JiraHook() diff --git a/tests/providers/jira/operators/__init__.py b/tests/providers/jira/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/jira/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/jira/operators/test_jira.py b/tests/providers/jira/operators/test_jira_operators.py similarity index 96% rename from tests/providers/jira/operators/test_jira.py rename to tests/providers/jira/operators/test_jira_operators.py index 40970e368fdc2..dc440a46ca890 100644 --- a/tests/providers/jira/operators/test_jira.py +++ b/tests/providers/jira/operators/test_jira_operators.py @@ -58,7 +58,7 @@ def setUp(self): host='https://localhost/jira/', port=443, extra='{"verify": "False", "project": "AIRFLOW"}')) - @patch("airflow.providers.jira.hooks.jira.JIRA", + @patch("airflow.providers.jira.hooks.airflow_jira.JIRA", autospec=True, return_value=jira_client_mock) def test_issue_search(self, jira_mock): jql_str = 'issuekey=TEST-1226' @@ -78,7 +78,7 @@ def test_issue_search(self, jira_mock): self.assertTrue(jira_mock.called) self.assertTrue(jira_mock.return_value.search_issues.called) - @patch("airflow.providers.jira.hooks.jira.JIRA", + @patch("airflow.providers.jira.hooks.airflow_jira.JIRA", autospec=True, return_value=jira_client_mock) def test_update_issue(self, jira_mock): jira_mock.return_value.add_comment.return_value = True diff --git a/tests/providers/jira/sensors/__init__.py b/tests/providers/jira/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/jira/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/jira/sensors/test_jira.py b/tests/providers/jira/sensors/test_airflow_jira_sensors.py similarity index 95% rename from tests/providers/jira/sensors/test_jira.py rename to tests/providers/jira/sensors/test_airflow_jira_sensors.py index 4e7d86514d388..51a9ddb099070 100644 --- a/tests/providers/jira/sensors/test_jira.py +++ b/tests/providers/jira/sensors/test_airflow_jira_sensors.py @@ -22,7 +22,7 @@ from airflow import DAG from airflow.models import Connection -from airflow.providers.jira.sensors.jira import JiraTicketSensor +from airflow.providers.jira.sensors.airflow_jira import JiraTicketSensor from airflow.utils import db, timezone DEFAULT_DATE = timezone.datetime(2017, 1, 1) @@ -58,7 +58,7 @@ def setUp(self): host='https://localhost/jira/', port=443, extra='{"verify": "False", "project": "AIRFLOW"}')) - @patch("airflow.providers.jira.hooks.jira.JIRA", + @patch("airflow.providers.jira.hooks.airflow_jira.JIRA", autospec=True, return_value=jira_client_mock) def test_issue_label_set(self, jira_mock): jira_mock.return_value.issue.return_value = minimal_test_ticket diff --git a/tests/providers/microsoft/__init__.py b/tests/providers/microsoft/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/azure/__init__.py b/tests/providers/microsoft/azure/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/azure/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/azure/hooks/__init__.py b/tests/providers/microsoft/azure/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/azure/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/azure/hooks/test_azure_container_instance.py b/tests/providers/microsoft/azure/hooks/test_azure_container_instance_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_container_instance.py rename to tests/providers/microsoft/azure/hooks/test_azure_container_instance_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_azure_container_registry.py b/tests/providers/microsoft/azure/hooks/test_azure_container_registry_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_container_registry.py rename to tests/providers/microsoft/azure/hooks/test_azure_container_registry_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_azure_container_volume.py b/tests/providers/microsoft/azure/hooks/test_azure_container_volume_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_container_volume.py rename to tests/providers/microsoft/azure/hooks/test_azure_container_volume_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_azure_cosmos.py b/tests/providers/microsoft/azure/hooks/test_azure_cosmos_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_cosmos.py rename to tests/providers/microsoft/azure/hooks/test_azure_cosmos_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_azure_data_lake.py b/tests/providers/microsoft/azure/hooks/test_azure_data_lake_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_data_lake.py rename to tests/providers/microsoft/azure/hooks/test_azure_data_lake_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_azure_fileshare.py b/tests/providers/microsoft/azure/hooks/test_azure_fileshare_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_azure_fileshare.py rename to tests/providers/microsoft/azure/hooks/test_azure_fileshare_hooks.py diff --git a/tests/providers/microsoft/azure/hooks/test_wasb.py b/tests/providers/microsoft/azure/hooks/test_wasb_hooks.py similarity index 100% rename from tests/providers/microsoft/azure/hooks/test_wasb.py rename to tests/providers/microsoft/azure/hooks/test_wasb_hooks.py diff --git a/tests/providers/microsoft/azure/operators/__init__.py b/tests/providers/microsoft/azure/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/azure/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/azure/operators/test_adls_list.py b/tests/providers/microsoft/azure/operators/test_adls_list_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_adls_list.py rename to tests/providers/microsoft/azure/operators/test_adls_list_operators.py diff --git a/tests/providers/microsoft/azure/operators/test_azure_container_instances.py b/tests/providers/microsoft/azure/operators/test_azure_container_instances_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_azure_container_instances.py rename to tests/providers/microsoft/azure/operators/test_azure_container_instances_operators.py diff --git a/tests/providers/microsoft/azure/operators/test_azure_cosmos.py b/tests/providers/microsoft/azure/operators/test_azure_cosmos_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_azure_cosmos.py rename to tests/providers/microsoft/azure/operators/test_azure_cosmos_operators.py diff --git a/tests/providers/microsoft/azure/operators/test_file_to_wasb.py b/tests/providers/microsoft/azure/operators/test_file_to_wasb_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_file_to_wasb.py rename to tests/providers/microsoft/azure/operators/test_file_to_wasb_operators.py diff --git a/tests/providers/microsoft/azure/operators/test_oracle_to_azure_data_lake_transfer.py b/tests/providers/microsoft/azure/operators/test_oracle_to_azure_data_lake_transfer_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_oracle_to_azure_data_lake_transfer.py rename to tests/providers/microsoft/azure/operators/test_oracle_to_azure_data_lake_transfer_operators.py diff --git a/tests/providers/microsoft/azure/operators/test_wasb_delete_blob.py b/tests/providers/microsoft/azure/operators/test_wasb_delete_blob_operators.py similarity index 100% rename from tests/providers/microsoft/azure/operators/test_wasb_delete_blob.py rename to tests/providers/microsoft/azure/operators/test_wasb_delete_blob_operators.py diff --git a/tests/providers/microsoft/azure/sensors/__init__.py b/tests/providers/microsoft/azure/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/azure/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/azure/sensors/test_wasb.py b/tests/providers/microsoft/azure/sensors/test_wasb_sensors.py similarity index 100% rename from tests/providers/microsoft/azure/sensors/test_wasb.py rename to tests/providers/microsoft/azure/sensors/test_wasb_sensors.py diff --git a/tests/providers/microsoft/msqql/__init__.py b/tests/providers/microsoft/msqql/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/msqql/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/msqql/operators/test_mssql.py b/tests/providers/microsoft/msqql/operators/test_mssql_operators.py similarity index 100% rename from tests/providers/microsoft/msqql/operators/test_mssql.py rename to tests/providers/microsoft/msqql/operators/test_mssql_operators.py diff --git a/tests/providers/microsoft/winrm/__init__.py b/tests/providers/microsoft/winrm/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/winrm/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/winrm/hooks/__init__.py b/tests/providers/microsoft/winrm/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/winrm/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/winrm/hooks/test_winrm.py b/tests/providers/microsoft/winrm/hooks/test_airflow_winrm_hooks.py similarity index 87% rename from tests/providers/microsoft/winrm/hooks/test_winrm.py rename to tests/providers/microsoft/winrm/hooks/test_airflow_winrm_hooks.py index 8eee208fcf79e..c97ae291bb6b3 100644 --- a/tests/providers/microsoft/winrm/hooks/test_winrm.py +++ b/tests/providers/microsoft/winrm/hooks/test_airflow_winrm_hooks.py @@ -22,12 +22,12 @@ from airflow import AirflowException from airflow.models import Connection -from airflow.providers.microsoft.winrm.hooks.winrm import WinRMHook +from airflow.providers.microsoft.winrm.hooks.airflow_winrm import WinRMHook class TestWinRMHook(unittest.TestCase): - @patch('airflow.providers.microsoft.winrm.hooks.winrm.Protocol') + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.Protocol') def test_get_conn_exists(self, mock_protocol): winrm_hook = WinRMHook() winrm_hook.client = mock_protocol.return_value.open_shell.return_value @@ -40,15 +40,15 @@ def test_get_conn_missing_remote_host(self): with self.assertRaises(AirflowException): WinRMHook().get_conn() - @patch('airflow.providers.microsoft.winrm.hooks.winrm.Protocol') + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.Protocol') def test_get_conn_error(self, mock_protocol): mock_protocol.side_effect = Exception('Error') with self.assertRaises(AirflowException): WinRMHook(remote_host='host').get_conn() - @patch('airflow.providers.microsoft.winrm.hooks.winrm.Protocol', autospec=True) - @patch('airflow.providers.microsoft.winrm.hooks.winrm.WinRMHook.get_connection', + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.Protocol', autospec=True) + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.WinRMHook.get_connection', return_value=Connection( login='username', password='password', @@ -99,8 +99,8 @@ def test_get_conn_from_connection(self, mock_get_connection, mock_protocol): send_cbt=str(connection.extra_dejson['send_cbt']).lower() == 'true' ) - @patch('airflow.providers.microsoft.winrm.hooks.winrm.getpass.getuser', return_value='user') - @patch('airflow.providers.microsoft.winrm.hooks.winrm.Protocol') + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.getpass.getuser', return_value='user') + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.Protocol') def test_get_conn_no_username(self, mock_protocol, mock_getuser): winrm_hook = WinRMHook(remote_host='host', password='password') @@ -108,7 +108,7 @@ def test_get_conn_no_username(self, mock_protocol, mock_getuser): self.assertEqual(mock_getuser.return_value, winrm_hook.username) - @patch('airflow.providers.microsoft.winrm.hooks.winrm.Protocol') + @patch('airflow.providers.microsoft.winrm.hooks.airflow_winrm.Protocol') def test_get_conn_no_endpoint(self, mock_protocol): winrm_hook = WinRMHook(remote_host='host', password='password') diff --git a/tests/providers/microsoft/winrm/operators/__init__.py b/tests/providers/microsoft/winrm/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/microsoft/winrm/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/microsoft/winrm/operators/test_winrm.py b/tests/providers/microsoft/winrm/operators/test_airflow_winrm_operators.py similarity index 90% rename from tests/providers/microsoft/winrm/operators/test_winrm.py rename to tests/providers/microsoft/winrm/operators/test_airflow_winrm_operators.py index 1652d8353dde1..4c7f2e54c9f92 100644 --- a/tests/providers/microsoft/winrm/operators/test_winrm.py +++ b/tests/providers/microsoft/winrm/operators/test_airflow_winrm_operators.py @@ -20,7 +20,7 @@ from unittest import mock from airflow.exceptions import AirflowException -from airflow.providers.microsoft.winrm.operators.winrm import WinRMOperator +from airflow.providers.microsoft.winrm.operators.airflow_winrm import WinRMOperator class TestWinRMOperator(unittest.TestCase): @@ -32,7 +32,7 @@ def test_no_winrm_hook_no_ssh_conn_id(self): with self.assertRaisesRegex(AirflowException, exception_msg): op.execute(None) - @mock.patch('airflow.providers.microsoft.winrm.operators.winrm.WinRMHook') + @mock.patch('airflow.providers.microsoft.winrm.operators.airflow_winrm.WinRMHook') def test_no_command(self, mock_hook): op = WinRMOperator( task_id='test_task_id', diff --git a/tests/providers/mongo/__init__.py b/tests/providers/mongo/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mongo/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mongo/hooks/__init__.py b/tests/providers/mongo/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mongo/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mongo/hooks/test_mongo.py b/tests/providers/mongo/hooks/test_mongo_hooks.py similarity index 100% rename from tests/providers/mongo/hooks/test_mongo.py rename to tests/providers/mongo/hooks/test_mongo_hooks.py diff --git a/tests/providers/mongo/sensors/__init__.py b/tests/providers/mongo/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mongo/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mongo/sensors/test_mongo.py b/tests/providers/mongo/sensors/test_mongo_sensors.py similarity index 100% rename from tests/providers/mongo/sensors/test_mongo.py rename to tests/providers/mongo/sensors/test_mongo_sensors.py diff --git a/tests/providers/mysql/__init__.py b/tests/providers/mysql/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mysql/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mysql/hooks/__init__.py b/tests/providers/mysql/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mysql/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mysql/hooks/test_mysql.py b/tests/providers/mysql/hooks/test_mysql_hooks.py similarity index 100% rename from tests/providers/mysql/hooks/test_mysql.py rename to tests/providers/mysql/hooks/test_mysql_hooks.py diff --git a/tests/providers/mysql/operators/__init__.py b/tests/providers/mysql/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/mysql/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/mysql/operators/test_mysql.py b/tests/providers/mysql/operators/test_mysql_operators.py similarity index 100% rename from tests/providers/mysql/operators/test_mysql.py rename to tests/providers/mysql/operators/test_mysql_operators.py diff --git a/tests/providers/mysql/operators/test_presto_to_mysql.py b/tests/providers/mysql/operators/test_presto_to_mysql_operators.py similarity index 100% rename from tests/providers/mysql/operators/test_presto_to_mysql.py rename to tests/providers/mysql/operators/test_presto_to_mysql_operators.py diff --git a/tests/providers/mysql/operators/test_vertica_to_mysql.py b/tests/providers/mysql/operators/test_vertica_to_mysql_operators.py similarity index 100% rename from tests/providers/mysql/operators/test_vertica_to_mysql.py rename to tests/providers/mysql/operators/test_vertica_to_mysql_operators.py diff --git a/tests/providers/odbc/hooks/test_odbc.py b/tests/providers/odbc/hooks/test_odbc_hooks.py similarity index 100% rename from tests/providers/odbc/hooks/test_odbc.py rename to tests/providers/odbc/hooks/test_odbc_hooks.py diff --git a/tests/providers/openfass/__init__.py b/tests/providers/openfass/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/openfass/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/openfass/hooks/__init__.py b/tests/providers/openfass/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/openfass/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/openfass/hooks/test_openfaas.py b/tests/providers/openfass/hooks/test_openfaas_hooks.py similarity index 100% rename from tests/providers/openfass/hooks/test_openfaas.py rename to tests/providers/openfass/hooks/test_openfaas_hooks.py diff --git a/tests/providers/opsgenie/__init__.py b/tests/providers/opsgenie/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/opsgenie/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/opsgenie/hooks/__init__.py b/tests/providers/opsgenie/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/opsgenie/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/opsgenie/hooks/test_opsgenie_alert.py b/tests/providers/opsgenie/hooks/test_opsgenie_alert_hooks.py similarity index 100% rename from tests/providers/opsgenie/hooks/test_opsgenie_alert.py rename to tests/providers/opsgenie/hooks/test_opsgenie_alert_hooks.py diff --git a/tests/providers/opsgenie/operators/__init__.py b/tests/providers/opsgenie/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/opsgenie/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/opsgenie/operators/test_opsgenie_alert.py b/tests/providers/opsgenie/operators/test_opsgenie_alert_operators.py similarity index 100% rename from tests/providers/opsgenie/operators/test_opsgenie_alert.py rename to tests/providers/opsgenie/operators/test_opsgenie_alert_operators.py diff --git a/tests/providers/oracle/__init__.py b/tests/providers/oracle/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/oracle/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/oracle/hooks/__init__.py b/tests/providers/oracle/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/oracle/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/oracle/hooks/test_oracle.py b/tests/providers/oracle/hooks/test_oracle_hooks.py similarity index 100% rename from tests/providers/oracle/hooks/test_oracle.py rename to tests/providers/oracle/hooks/test_oracle_hooks.py diff --git a/tests/providers/oracle/operators/__init__.py b/tests/providers/oracle/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/oracle/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/oracle/operators/test_oracle_to_oracle_transfer.py b/tests/providers/oracle/operators/test_oracle_to_oracle_transfer_operators.py similarity index 100% rename from tests/providers/oracle/operators/test_oracle_to_oracle_transfer.py rename to tests/providers/oracle/operators/test_oracle_to_oracle_transfer_operators.py diff --git a/tests/providers/pagerduty/__init__.py b/tests/providers/pagerduty/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/pagerduty/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/pagerduty/hooks/__init__.py b/tests/providers/pagerduty/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/pagerduty/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/pagerduty/hooks/test_pagerduty.py b/tests/providers/pagerduty/hooks/test_pagerduty_hooks.py similarity index 100% rename from tests/providers/pagerduty/hooks/test_pagerduty.py rename to tests/providers/pagerduty/hooks/test_pagerduty_hooks.py diff --git a/tests/providers/papermill/__init__.py b/tests/providers/papermill/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/papermill/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/papermill/operators/__init__.py b/tests/providers/papermill/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/papermill/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/papermill/operators/test_papermill.py b/tests/providers/papermill/operators/test_papermill_operators.py similarity index 100% rename from tests/providers/papermill/operators/test_papermill.py rename to tests/providers/papermill/operators/test_papermill_operators.py diff --git a/tests/providers/postgres/__init__.py b/tests/providers/postgres/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/postgres/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/postgres/hooks/__init__.py b/tests/providers/postgres/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/postgres/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/postgres/hooks/test_postgres.py b/tests/providers/postgres/hooks/test_postgres_hooks.py similarity index 100% rename from tests/providers/postgres/hooks/test_postgres.py rename to tests/providers/postgres/hooks/test_postgres_hooks.py diff --git a/tests/providers/postgres/operators/__init__.py b/tests/providers/postgres/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/postgres/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/postgres/operators/test_postgres.py b/tests/providers/postgres/operators/test_postgres_operators.py similarity index 100% rename from tests/providers/postgres/operators/test_postgres.py rename to tests/providers/postgres/operators/test_postgres_operators.py diff --git a/tests/providers/presto/__init__.py b/tests/providers/presto/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/presto/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/presto/hooks/__init__.py b/tests/providers/presto/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/presto/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/presto/hooks/test_presto.py b/tests/providers/presto/hooks/test_presto_hooks.py similarity index 100% rename from tests/providers/presto/hooks/test_presto.py rename to tests/providers/presto/hooks/test_presto_hooks.py diff --git a/tests/providers/qubole/__init__.py b/tests/providers/qubole/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/qubole/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/qubole/hooks/__init__.py b/tests/providers/qubole/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/qubole/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/qubole/hooks/test_qubole_check.py b/tests/providers/qubole/hooks/test_qubole_check_hooks.py similarity index 100% rename from tests/providers/qubole/hooks/test_qubole_check.py rename to tests/providers/qubole/hooks/test_qubole_check_hooks.py diff --git a/tests/providers/qubole/operators/__init__.py b/tests/providers/qubole/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/qubole/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/qubole/operators/test_qubole_check.py b/tests/providers/qubole/operators/test_qubole_check_operators.py similarity index 100% rename from tests/providers/qubole/operators/test_qubole_check.py rename to tests/providers/qubole/operators/test_qubole_check_operators.py diff --git a/tests/providers/qubole/operators/test_qubole.py b/tests/providers/qubole/operators/test_qubole_operators.py similarity index 100% rename from tests/providers/qubole/operators/test_qubole.py rename to tests/providers/qubole/operators/test_qubole_operators.py diff --git a/tests/providers/qubole/sensors/__init__.py b/tests/providers/qubole/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/qubole/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/qubole/sensors/test_qubole.py b/tests/providers/qubole/sensors/test_qubole_sensors.py similarity index 100% rename from tests/providers/qubole/sensors/test_qubole.py rename to tests/providers/qubole/sensors/test_qubole_sensors.py diff --git a/tests/providers/redis/__init__.py b/tests/providers/redis/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/redis/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/redis/hooks/__init__.py b/tests/providers/redis/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/redis/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/redis/hooks/test_redis.py b/tests/providers/redis/hooks/test_airflow_redis_hooks.py similarity index 94% rename from tests/providers/redis/hooks/test_redis.py rename to tests/providers/redis/hooks/test_airflow_redis_hooks.py index d5a464d9661b0..bbdf314041645 100644 --- a/tests/providers/redis/hooks/test_redis.py +++ b/tests/providers/redis/hooks/test_airflow_redis_hooks.py @@ -23,7 +23,7 @@ import pytest from airflow.models import Connection -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook class TestRedisHook(unittest.TestCase): @@ -37,8 +37,8 @@ def test_get_conn(self): self.assertEqual(hook.db, None, 'db initialised as None.') self.assertIs(hook.get_conn(), hook.get_conn(), 'Connection initialized only if None.') - @mock.patch('airflow.providers.redis.hooks.redis.Redis') - @mock.patch('airflow.providers.redis.hooks.redis.RedisHook.get_connection', + @mock.patch('airflow.providers.redis.hooks.airflow_redis.Redis') + @mock.patch('airflow.providers.redis.hooks.airflow_redis.RedisHook.get_connection', return_value=Connection( password='password', host='remote_host', diff --git a/tests/providers/redis/operators/__init__.py b/tests/providers/redis/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/redis/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/redis/operators/test_redis_publish.py b/tests/providers/redis/operators/test_redis_publish_operators.py similarity index 97% rename from tests/providers/redis/operators/test_redis_publish.py rename to tests/providers/redis/operators/test_redis_publish_operators.py index 34602235f3f05..bcbf9a72d4f72 100644 --- a/tests/providers/redis/operators/test_redis_publish.py +++ b/tests/providers/redis/operators/test_redis_publish_operators.py @@ -23,7 +23,7 @@ from mock import MagicMock from airflow import DAG -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.providers.redis.operators.redis_publish import RedisPublishOperator from airflow.utils import timezone diff --git a/tests/providers/redis/sensors/__init__.py b/tests/providers/redis/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/redis/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/redis/sensors/test_redis_key.py b/tests/providers/redis/sensors/test_redis_key_sensors.py similarity index 96% rename from tests/providers/redis/sensors/test_redis_key.py rename to tests/providers/redis/sensors/test_redis_key_sensors.py index 6a57431b903db..e7f8726bae241 100644 --- a/tests/providers/redis/sensors/test_redis_key.py +++ b/tests/providers/redis/sensors/test_redis_key_sensors.py @@ -22,7 +22,7 @@ import pytest from airflow import DAG -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.providers.redis.sensors.redis_key import RedisKeySensor from airflow.utils import timezone diff --git a/tests/providers/redis/sensors/test_redis_pub_sub.py b/tests/providers/redis/sensors/test_redis_pub_sub_sensors.py similarity index 95% rename from tests/providers/redis/sensors/test_redis_pub_sub.py rename to tests/providers/redis/sensors/test_redis_pub_sub_sensors.py index 6ee1a8ebe974c..91d56c064c5bf 100644 --- a/tests/providers/redis/sensors/test_redis_pub_sub.py +++ b/tests/providers/redis/sensors/test_redis_pub_sub_sensors.py @@ -23,7 +23,7 @@ import pytest from airflow import DAG -from airflow.providers.redis.hooks.redis import RedisHook +from airflow.providers.redis.hooks.airflow_redis import RedisHook from airflow.providers.redis.sensors.redis_pub_sub import RedisPubSubSensor from airflow.utils import timezone @@ -42,7 +42,7 @@ def setUp(self): self.mock_context = MagicMock() - @patch('airflow.providers.redis.hooks.redis.RedisHook.get_conn') + @patch('airflow.providers.redis.hooks.airflow_redis.RedisHook.get_conn') def test_poke_mock_true(self, mock_redis_conn): sensor = RedisPubSubSensor( task_id='test_task', @@ -62,7 +62,7 @@ def test_poke_mock_true(self, mock_redis_conn): self.assertTrue(self.mock_context['ti'].method_calls == context_calls, "context call should be same") - @patch('airflow.providers.redis.hooks.redis.RedisHook.get_conn') + @patch('airflow.providers.redis.hooks.airflow_redis.RedisHook.get_conn') def test_poke_mock_false(self, mock_redis_conn): sensor = RedisPubSubSensor( task_id='test_task', diff --git a/tests/providers/salesforce/__init__.py b/tests/providers/salesforce/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/salesforce/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/salesforce/hooks/__init__.py b/tests/providers/salesforce/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/salesforce/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/salesforce/hooks/test_salesforce.py b/tests/providers/salesforce/hooks/test_salesforce_hooks.py similarity index 100% rename from tests/providers/salesforce/hooks/test_salesforce.py rename to tests/providers/salesforce/hooks/test_salesforce_hooks.py diff --git a/tests/providers/segment/__init__.py b/tests/providers/segment/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/segment/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/segment/hooks/__init__.py b/tests/providers/segment/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/segment/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/segment/hooks/test_segment.py b/tests/providers/segment/hooks/test_segment_hooks.py similarity index 100% rename from tests/providers/segment/hooks/test_segment.py rename to tests/providers/segment/hooks/test_segment_hooks.py diff --git a/tests/providers/segment/operators/__init__.py b/tests/providers/segment/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/segment/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/segment/operators/test_segment_track_event.py b/tests/providers/segment/operators/test_segment_track_event_operators.py similarity index 100% rename from tests/providers/segment/operators/test_segment_track_event.py rename to tests/providers/segment/operators/test_segment_track_event_operators.py diff --git a/tests/providers/sftp/__init__.py b/tests/providers/sftp/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/sftp/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/sftp/hooks/__init__.py b/tests/providers/sftp/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/sftp/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/sftp/hooks/test_sftp.py b/tests/providers/sftp/hooks/test_sftp_hooks.py similarity index 100% rename from tests/providers/sftp/hooks/test_sftp.py rename to tests/providers/sftp/hooks/test_sftp_hooks.py diff --git a/tests/providers/sftp/operators/__init__.py b/tests/providers/sftp/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/sftp/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/sftp/operators/test_sftp.py b/tests/providers/sftp/operators/test_sftp_operators.py similarity index 100% rename from tests/providers/sftp/operators/test_sftp.py rename to tests/providers/sftp/operators/test_sftp_operators.py diff --git a/tests/providers/sftp/sensors/__init__.py b/tests/providers/sftp/sensors/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/sftp/sensors/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/sftp/sensors/test_sftp.py b/tests/providers/sftp/sensors/test_sftp_sensors.py similarity index 100% rename from tests/providers/sftp/sensors/test_sftp.py rename to tests/providers/sftp/sensors/test_sftp_sensors.py diff --git a/tests/providers/slack/__init__.py b/tests/providers/slack/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/slack/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/slack/hooks/__init__.py b/tests/providers/slack/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/slack/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/slack/hooks/test_slack.py b/tests/providers/slack/hooks/test_slack_hooks.py similarity index 100% rename from tests/providers/slack/hooks/test_slack.py rename to tests/providers/slack/hooks/test_slack_hooks.py diff --git a/tests/providers/slack/hooks/test_slack_webhook.py b/tests/providers/slack/hooks/test_slack_webhook_hooks.py similarity index 100% rename from tests/providers/slack/hooks/test_slack_webhook.py rename to tests/providers/slack/hooks/test_slack_webhook_hooks.py diff --git a/tests/providers/slack/operators/__init__.py b/tests/providers/slack/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/slack/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/slack/operators/test_slack.py b/tests/providers/slack/operators/test_slack_operators.py similarity index 100% rename from tests/providers/slack/operators/test_slack.py rename to tests/providers/slack/operators/test_slack_operators.py diff --git a/tests/providers/slack/operators/test_slack_webhook.py b/tests/providers/slack/operators/test_slack_webhook_operators.py similarity index 100% rename from tests/providers/slack/operators/test_slack_webhook.py rename to tests/providers/slack/operators/test_slack_webhook_operators.py diff --git a/tests/providers/snowflake/__init__.py b/tests/providers/snowflake/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/snowflake/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/snowflake/hooks/__init__.py b/tests/providers/snowflake/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/snowflake/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/snowflake/hooks/snowflake.py b/tests/providers/snowflake/hooks/test_airflow_snowflake_hooks.py similarity index 98% rename from tests/providers/snowflake/hooks/snowflake.py rename to tests/providers/snowflake/hooks/test_airflow_snowflake_hooks.py index 33895e13adf6a..153d5fd5dbc8c 100644 --- a/tests/providers/snowflake/hooks/snowflake.py +++ b/tests/providers/snowflake/hooks/test_airflow_snowflake_hooks.py @@ -24,7 +24,7 @@ from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import rsa -from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook +from airflow.providers.snowflake.hooks.airflow_snowflake import SnowflakeHook class TestSnowflakeHook(unittest.TestCase): diff --git a/tests/providers/snowflake/operators/__init__.py b/tests/providers/snowflake/operators/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/snowflake/operators/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/snowflake/operators/s3_to_snowflake.py b/tests/providers/snowflake/operators/test_s3_to_snowflake_operators.py similarity index 89% rename from tests/providers/snowflake/operators/s3_to_snowflake.py rename to tests/providers/snowflake/operators/test_s3_to_snowflake_operators.py index b9cc3c49f00c2..6c49342817c7b 100644 --- a/tests/providers/snowflake/operators/s3_to_snowflake.py +++ b/tests/providers/snowflake/operators/test_s3_to_snowflake_operators.py @@ -20,11 +20,11 @@ from unittest import mock from airflow.providers.snowflake.operators.s3_to_snowflake import S3ToSnowflakeTransfer -from airflow.utils.tests import assertEqualIgnoreMultipleSpaces +from tests.test_utils.asserts import assert_equal_ignore_multiple_spaces class TestS3ToSnowflakeTransfer(unittest.TestCase): - @mock.patch("airflow.providers.snowflake.hooks.snowflake.SnowflakeHook.run") + @mock.patch("airflow.hooks.dbapi_hook.DbApiHook.run") def test_execute(self, mock_run): s3_keys = ['1.csv', '2.csv'] table = 'table' @@ -65,9 +65,9 @@ def test_execute(self, mock_run): ) assert mock_run.call_count == 1 - assertEqualIgnoreMultipleSpaces(self, mock_run.call_args[0][0], copy_query) + assert_equal_ignore_multiple_spaces(self, mock_run.call_args[0][0], copy_query) - @mock.patch("airflow.providers.snowflake.hooks.snowflake.SnowflakeHook.run") + @mock.patch("airflow.providers.snowflake.hooks.airflow_snowflake.SnowflakeHook.run") def test_execute_with_columns(self, mock_run): s3_keys = ['1.csv', '2.csv'] table = 'table' @@ -110,4 +110,4 @@ def test_execute_with_columns(self, mock_run): ) assert mock_run.call_count == 1 - assertEqualIgnoreMultipleSpaces(self, mock_run.call_args[0][0], copy_query) + assert_equal_ignore_multiple_spaces(self, mock_run.call_args[0][0], copy_query) diff --git a/tests/providers/snowflake/operators/snowflake.py b/tests/providers/snowflake/operators/test_snowflake_operators.py similarity index 100% rename from tests/providers/snowflake/operators/snowflake.py rename to tests/providers/snowflake/operators/test_snowflake_operators.py diff --git a/tests/providers/sqlite/__init__.py b/tests/providers/sqlite/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/sqlite/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/sqlite/hooks/__init__.py b/tests/providers/sqlite/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/sqlite/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/sqlite/hooks/test_sqlite.py b/tests/providers/sqlite/hooks/test_sqlite_hooks.py similarity index 100% rename from tests/providers/sqlite/hooks/test_sqlite.py rename to tests/providers/sqlite/hooks/test_sqlite_hooks.py diff --git a/tests/providers/ssh/__init__.py b/tests/providers/ssh/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ssh/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ssh/hooks/__init__.py b/tests/providers/ssh/hooks/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ssh/hooks/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ssh/hooks/test_ssh.py b/tests/providers/ssh/hooks/test_ssh_hooks.py similarity index 100% rename from tests/providers/ssh/hooks/test_ssh.py rename to tests/providers/ssh/hooks/test_ssh_hooks.py diff --git a/tests/providers/ssh/operators/__init__.py b/tests/providers/ssh/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/ssh/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/ssh/operators/test_ssh.py b/tests/providers/ssh/operators/test_ssh_operators.py similarity index 100% rename from tests/providers/ssh/operators/test_ssh.py rename to tests/providers/ssh/operators/test_ssh_operators.py diff --git a/tests/providers/vertica/__init__.py b/tests/providers/vertica/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/vertica/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/vertica/operators/__init__.py b/tests/providers/vertica/operators/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/providers/vertica/operators/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/providers/vertica/operators/test_vertica.py b/tests/providers/vertica/operators/test_vertica_operators.py similarity index 100% rename from tests/providers/vertica/operators/test_vertica.py rename to tests/providers/vertica/operators/test_vertica_operators.py diff --git a/tests/providers/zendesk/__init__.py b/tests/providers/zendesk/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/zendesk/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/zendesk/hooks/__init__.py b/tests/providers/zendesk/hooks/__init__.py deleted file mode 100644 index 13a83393a9124..0000000000000 --- a/tests/providers/zendesk/hooks/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -# -# 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. diff --git a/tests/providers/zendesk/hooks/test_zendesk.py b/tests/providers/zendesk/hooks/test_zendesk_hooks.py similarity index 100% rename from tests/providers/zendesk/hooks/test_zendesk.py rename to tests/providers/zendesk/hooks/test_zendesk_hooks.py diff --git a/tests/runtime/__init__.py b/tests/runtime/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/runtime/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/runtime/kubernetes/__init__.py b/tests/runtime/kubernetes/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/runtime/kubernetes/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/runtime/kubernetes/test_kubernetes_executor.py b/tests/runtime/kubernetes/test_runtime_kubernetes_executor.py similarity index 100% rename from tests/runtime/kubernetes/test_kubernetes_executor.py rename to tests/runtime/kubernetes/test_runtime_kubernetes_executor.py index 492c248fa6146..ac5b1ee77848d 100644 --- a/tests/runtime/kubernetes/test_kubernetes_executor.py +++ b/tests/runtime/kubernetes/test_runtime_kubernetes_executor.py @@ -64,6 +64,7 @@ def setUp(self): self._ensure_airflow_webserver_is_healthy() def tearDown(self): + self.dump_kubernetes_logs() self.session.close() def monitor_task(self, host, execution_date, dag_id, task_id, expected_final_state, @@ -97,7 +98,6 @@ def monitor_task(self, host, execution_date, dag_id, task_id, expected_final_sta check_call(["echo", "api call failed. trying again. error {}".format(e)]) if state != expected_final_state: print("The expected state is wrong {} != {} (expected)!".format(state, expected_final_state)) - self.dump_kubernetes_logs() self.assertEqual(state, expected_final_state) def dump_kubernetes_logs(self): diff --git a/tests/runtime/kubernetes/test_kubernetes_pod_operator.py b/tests/runtime/kubernetes/test_runtime_kubernetes_pod_operator.py similarity index 100% rename from tests/runtime/kubernetes/test_kubernetes_pod_operator.py rename to tests/runtime/kubernetes/test_runtime_kubernetes_pod_operator.py diff --git a/tests/security/__init__.py b/tests/security/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/security/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/security/test_kerberos.py b/tests/security/test_kerberos.py index b9b100bcd972b..e8688e491df96 100644 --- a/tests/security/test_kerberos.py +++ b/tests/security/test_kerberos.py @@ -21,8 +21,8 @@ from argparse import Namespace from airflow.configuration import conf -from airflow.security import kerberos -from airflow.security.kerberos import renew_from_kt +from airflow.security import kerberos_security +from airflow.security.kerberos_security import renew_from_kt from tests.test_utils.config import conf_vars @@ -57,7 +57,7 @@ def test_args_from_cli(self): renew_from_kt(principal=self.args.principal, # pylint: disable=no-member keytab=self.args.keytab) - with self.assertLogs(kerberos.log) as log: + with self.assertLogs(kerberos_security.log) as log: self.assertIn( 'kinit: krb5_init_creds_set_keytab: Failed to find ' 'airflow@LUPUS.GRIDDYNAMICS.NET in keytab FILE:{} ' diff --git a/tests/sensors/__init__.py b/tests/sensors/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/sensors/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/sensors/test_bash.py b/tests/sensors/test_bash_sensors.py similarity index 100% rename from tests/sensors/test_bash.py rename to tests/sensors/test_bash_sensors.py diff --git a/tests/sensors/test_python.py b/tests/sensors/test_python_sensors.py similarity index 100% rename from tests/sensors/test_python.py rename to tests/sensors/test_python_sensors.py diff --git a/tests/serialization/__init__.py b/tests/serialization/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/serialization/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/task/task_runner/__init__.py b/tests/task/task_runner/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/task/task_runner/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/test_core_to_contrib.py b/tests/test_core_to_contrib.py index d9f73d2c6e249..7eb4df6622bc1 100644 --- a/tests/test_core_to_contrib.py +++ b/tests/test_core_to_contrib.py @@ -185,11 +185,11 @@ 'airflow.hooks.druid_hook.DruidDbApiHook', ), ( - 'airflow.providers.apache.hdfs.hooks.hdfs.HDFSHookException', + 'airflow.providers.apache.hdfs.hooks.airflow_hdfs.HDFSHookException', 'airflow.hooks.hdfs_hook.HDFSHookException', ), ( - 'airflow.providers.apache.hdfs.hooks.hdfs.HDFSHook', + 'airflow.providers.apache.hdfs.hooks.airflow_hdfs.HDFSHook', 'airflow.hooks.hdfs_hook.HDFSHook', ), ( @@ -266,11 +266,11 @@ 'airflow.contrib.hooks.openfaas_hook.OpenFaasHook', ), ( - 'airflow.providers.redis.hooks.redis.RedisHook', + 'airflow.providers.redis.hooks.airflow_redis.RedisHook', 'airflow.contrib.hooks.redis_hook.RedisHook', ), ( - 'airflow.providers.docker.hooks.docker.DockerHook', + 'airflow.providers.docker.hooks.airflow_docker.DockerHook', 'airflow.hooks.docker_hook.DockerHook', ), ( @@ -302,7 +302,7 @@ 'airflow.hooks.sqlite_hook.SqliteHook', ), ( - 'airflow.providers.cloudant.hooks.cloudant.CloudantHook', + 'airflow.providers.cloudant.hooks.airflow_cloudant.CloudantHook', 'airflow.contrib.hooks.cloudant_hook.CloudantHook', ), ( @@ -390,7 +390,7 @@ 'airflow.contrib.hooks.ssh_hook.SSHHook', ), ( - 'airflow.providers.microsoft.winrm.hooks.winrm.WinRMHook', + 'airflow.providers.microsoft.winrm.hooks.airflow_winrm.WinRMHook', 'airflow.contrib.hooks.winrm_hook.WinRMHook', ), ( @@ -1160,7 +1160,7 @@ 'airflow.operators.bash_operator.BashOperator', ), ( - 'airflow.providers.docker.operators.docker.DockerOperator', + 'airflow.providers.docker.operators.docker_operator.DockerOperator', 'airflow.operators.docker_operator.DockerOperator', ), ( @@ -1260,7 +1260,7 @@ 'airflow.contrib.operators.vertica_operator.VerticaOperator', ), ( - 'airflow.providers.datadog.sensors.datadog.DatadogSensor', + 'airflow.providers.datadog.sensors.airflow_datadog.DatadogSensor', 'airflow.contrib.sensors.datadog_sensor.DatadogSensor', ), @@ -1273,7 +1273,7 @@ 'airflow.operators.slack_operator.SlackAPIOperator', ), ( - 'airflow.providers.grpc.operators.grpc.GrpcOperator', + 'airflow.providers.grpc.operators.airflow_grpc.GrpcOperator', 'airflow.contrib.operators.grpc_operator.GrpcOperator', ), ( @@ -1281,7 +1281,7 @@ 'airflow.contrib.operators.ssh_operator.SSHOperator', ), ( - 'airflow.providers.microsoft.winrm.operators.winrm.WinRMOperator', + 'airflow.providers.microsoft.winrm.operators.airflow_winrm.WinRMOperator', 'airflow.contrib.operators.winrm_operator.WinRMOperator', ), ( @@ -1548,7 +1548,7 @@ 'airflow.contrib.sensors.redis_pub_sub_sensor.RedisPubSubSensor', ), ( - 'airflow.providers.datadog.sensors.datadog.DatadogSensor', + 'airflow.providers.datadog.sensors.airflow_datadog.DatadogSensor', 'airflow.contrib.sensors.datadog_sensor.DatadogSensor', ), ( diff --git a/tests/test_project_structure.py b/tests/test_project_structure.py index 5907cf57c09f9..b9a4cb21b81a8 100644 --- a/tests/test_project_structure.py +++ b/tests/test_project_structure.py @@ -19,44 +19,42 @@ import mmap import os import unittest +from typing import Optional ROOT_FOLDER = os.path.realpath( os.path.join(os.path.dirname(os.path.realpath(__file__)), os.pardir) ) MISSING_TEST_FILES = { - 'tests/providers/amazon/aws/hooks/test_athena.py', - 'tests/providers/amazon/aws/hooks/test_s3.py', - 'tests/providers/apache/cassandra/sensors/test_record.py', - 'tests/providers/apache/cassandra/sensors/test_table.py', - 'tests/providers/apache/hdfs/sensors/test_web_hdfs.py', - 'tests/providers/apache/hive/operators/test_vertica_to_hive.py', - 'tests/providers/apache/hive/sensors/test_hive_partition.py', - 'tests/providers/apache/hive/sensors/test_metastore_partition.py', - 'tests/providers/apache/pig/operators/test_pig.py', - 'tests/providers/apache/spark/hooks/test_spark_jdbc_script.py', - 'tests/providers/cncf/kubernetes/operators/test_kubernetes_pod.py', - 'tests/providers/google/cloud/operators/test_datastore.py', - 'tests/providers/google/cloud/operators/test_gcs_to_bigquery.py', - 'tests/providers/google/cloud/operators/test_sql_to_gcs.py', - 'tests/providers/google/cloud/sensors/test_bigquery.py', + 'tests/providers/amazon/aws/hooks/test_athena_hooks.py', + 'tests/providers/amazon/aws/hooks/test_s3_hooks.py', + 'tests/providers/apache/cassandra/sensors/test_record_sensors.py', + 'tests/providers/apache/cassandra/sensors/test_table_sensors.py', + 'tests/providers/apache/hdfs/sensors/test_web_hdfs_sensors.py', + 'tests/providers/apache/hive/operators/test_vertica_to_hive_operators.py', + 'tests/providers/apache/hive/sensors/test_hive_partition_sensors.py', + 'tests/providers/apache/hive/sensors/test_metastore_partition_sensors.py', + 'tests/providers/apache/pig/operators/test_pig_operators.py', + 'tests/providers/apache/spark/hooks/test_spark_jdbc_script_hooks.py', + 'tests/providers/cncf/kubernetes/operators/test_kubernetes_pod_operators.py', + 'tests/providers/google/cloud/operators/test_datastore_operators.py', + 'tests/providers/google/cloud/operators/test_gcs_to_bigquery_operators.py', + 'tests/providers/google/cloud/operators/test_sql_to_gcs_operators.py', + 'tests/providers/google/cloud/sensors/test_bigquery_sensors.py', 'tests/providers/google/cloud/utils/test_field_sanitizer.py', 'tests/providers/google/cloud/utils/test_field_validator.py', 'tests/providers/google/cloud/utils/test_mlengine_operator_utils.py', 'tests/providers/google/cloud/utils/test_mlengine_prediction_summary.py', - 'tests/providers/jenkins/hooks/test_jenkins.py', - 'tests/providers/microsoft/azure/sensors/test_azure_cosmos.py', - 'tests/providers/microsoft/mssql/hooks/test_mssql.py', - 'tests/providers/microsoft/mssql/operators/test_mssql.py', - 'tests/providers/oracle/operators/test_oracle.py', - 'tests/providers/presto/operators/test_presto_check.py', - 'tests/providers/qubole/hooks/test_qubole.py', - 'tests/providers/samba/hooks/test_samba.py', - 'tests/providers/snowflake/hooks/test_snowflake.py', - 'tests/providers/snowflake/operators/test_s3_to_snowflake.py', - 'tests/providers/snowflake/operators/test_snowflake.py', - 'tests/providers/sqlite/operators/test_sqlite.py', - 'tests/providers/vertica/hooks/test_vertica.py' + 'tests/providers/jenkins/hooks/test_jenkins_hooks.py', + 'tests/providers/microsoft/azure/sensors/test_azure_cosmos_sensors.py', + 'tests/providers/microsoft/mssql/hooks/test_mssql_hooks.py', + 'tests/providers/microsoft/mssql/operators/test_mssql_operators.py', + 'tests/providers/oracle/operators/test_oracle_operators.py', + 'tests/providers/presto/operators/test_presto_check_operators.py', + 'tests/providers/qubole/hooks/test_qubole_hooks.py', + 'tests/providers/samba/hooks/test_samba_hooks.py', + 'tests/providers/sqlite/operators/test_sqlite_operators.py', + 'tests/providers/vertica/hooks/test_vertica_hooks.py' } @@ -89,35 +87,39 @@ def test_providers_modules_should_have_tests(self): """ Assert every module in /airflow/providers has a corresponding test_ file in tests/airflow/providers. """ + def get_test_file_path(file_path: str) -> Optional[str]: + if not file_path.endswith(".py"): + return None + path_array = file_path.split("/") + file_name = path_array[-1] + folder = path_array[-2] + if folder in {'hooks', 'operators', 'sensors'}: + path_array[-1] = f"test_{file_name.rpartition('.')[0]}_{folder}.py" + else: + path_array[-1] = f"test_{file_name}" + path_array[0] = "tests" + return "/".join(path_array) # TODO: Should we extend this test to cover other directories? - expected_test_files = glob.glob(f"{ROOT_FOLDER}/airflow/providers/**/*.py", recursive=True) + expected_test_file_paths = glob.glob(f"{ROOT_FOLDER}/airflow/providers/**/*.py", recursive=True) # Make path relative - expected_test_files = (os.path.relpath(f, ROOT_FOLDER) for f in expected_test_files) + expected_test_file_paths = (os.path.relpath(f, ROOT_FOLDER) for f in expected_test_file_paths) # Exclude example_dags - expected_test_files = (f for f in expected_test_files if "/example_dags/" not in f) - # Exclude __init__.py - expected_test_files = (f for f in expected_test_files if not f.endswith("__init__.py")) - # Change airflow/ to tests/ - expected_test_files = ( - f'tests/{f.partition("/")[2]}' - for f in expected_test_files if not f.endswith("__init__.py") + expected_test_file_paths = (f for f in expected_test_file_paths if "/example_dags/" not in f) + # convert test names + expected_test_file_paths = ( + get_test_file_path(f) for f in expected_test_file_paths ) - # Add test_ prefix to filename - expected_test_files = ( - f'{f.rpartition("/")[0]}/test_{f.rpartition("/")[2]}' - for f in expected_test_files if not f.endswith("__init__.py") - ) - + # exclude Nones + expected_test_file_paths = filter(None, expected_test_file_paths) current_test_files = glob.glob(f"{ROOT_FOLDER}/tests/providers/**/*.py", recursive=True) # Make path relative current_test_files = (os.path.relpath(f, ROOT_FOLDER) for f in current_test_files) - # Exclude __init__.py - current_test_files = (f for f in current_test_files if not f.endswith("__init__.py")) - expected_test_files = set(expected_test_files) + expected_test_file_paths = set(expected_test_file_paths) current_test_files = set(current_test_files) - missing_tests_files = expected_test_files - expected_test_files.intersection(current_test_files) + missing_tests_files = expected_test_file_paths - \ + expected_test_file_paths.intersection(current_test_files) self.assertEqual(set(), missing_tests_files - MISSING_TEST_FILES) def test_keep_missing_test_files_update(self): diff --git a/tests/test_utils/README.md b/tests/test_utils/README.md deleted file mode 100644 index 9e9fe3e9b22a8..0000000000000 --- a/tests/test_utils/README.md +++ /dev/null @@ -1,19 +0,0 @@ - -# Utilities for use in tests. diff --git a/tests/test_utils/__init__.py b/tests/test_utils/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/test_utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/airflow/api/auth/__init__.py b/tests/test_utils/mock_mail.py similarity index 93% rename from airflow/api/auth/__init__.py rename to tests/test_utils/mock_mail.py index 217e5db960782..6fdafbddda051 100644 --- a/airflow/api/auth/__init__.py +++ b/tests/test_utils/mock_mail.py @@ -1,4 +1,3 @@ -# # 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 @@ -15,3 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + +from unittest.mock import Mock + +send_email_test = Mock() diff --git a/tests/ti_deps/__init__.py b/tests/ti_deps/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/ti_deps/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/ti_deps/contexts/__init__.py b/tests/ti_deps/contexts/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/ti_deps/contexts/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/ti_deps/deps/__init__.py b/tests/ti_deps/deps/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/ti_deps/deps/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/utils/log/__init__.py b/tests/utils/log/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/utils/log/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/utils/log/elasticmock/__init__.py b/tests/utils/log/elasticmock/elasticmock.py similarity index 97% rename from tests/utils/log/elasticmock/__init__.py rename to tests/utils/log/elasticmock/elasticmock.py index b926c5dd18b83..84d50db1a75df 100644 --- a/tests/utils/log/elasticmock/__init__.py +++ b/tests/utils/log/elasticmock/elasticmock.py @@ -44,7 +44,7 @@ from elasticsearch.client import _normalize_hosts from mock import patch -from .fake_elasticsearch import FakeElasticsearch +from tests.utils.log.elasticmock.fake_elasticsearch import FakeElasticsearch ELASTIC_INSTANCES = {} # type: Dict[str, FakeElasticsearch] diff --git a/tests/utils/log/elasticmock/fake_elasticsearch.py b/tests/utils/log/elasticmock/fake_elasticsearch.py index f721a16e8f02f..0d378299dbcb9 100644 --- a/tests/utils/log/elasticmock/fake_elasticsearch.py +++ b/tests/utils/log/elasticmock/fake_elasticsearch.py @@ -44,11 +44,11 @@ from elasticsearch.client.utils import query_params from elasticsearch.exceptions import NotFoundError -from .utilities import get_random_id - - # pylint: disable=redefined-builtin # noinspection PyShadowingBuiltins +from tests.utils.log.elasticmock.utilities import get_random_id + + class FakeElasticsearch(Elasticsearch): __documents_dict = None diff --git a/tests/utils/log/test_es_task_handler.py b/tests/utils/log/test_es_task_handler.py index 408e7cf245cfb..808f07173125d 100644 --- a/tests/utils/log/test_es_task_handler.py +++ b/tests/utils/log/test_es_task_handler.py @@ -32,8 +32,7 @@ from airflow.utils.log.es_task_handler import ElasticsearchTaskHandler from airflow.utils.state import State from airflow.utils.timezone import datetime - -from .elasticmock import elasticmock +from tests.utils.log.elasticmock.elasticmock import elasticmock class TestElasticsearchTaskHandler(unittest.TestCase): diff --git a/tests/utils/test_db.py b/tests/utils/test_db.py index e724543f6b951..49ff5591ec18e 100644 --- a/tests/utils/test_db.py +++ b/tests/utils/test_db.py @@ -90,6 +90,11 @@ def test_database_schema_and_sqlalchemy_model_are_in_sync(self): lambda t: (t[0] == 'remove_index' and t[1].name == 'permission_view_id'), + # Ignore all deleted tables (we keep them in metadata for + # reset to delete those tables if they are present + lambda t: (t[0] == 'add_table' and + t[1].name in ('chart', 'user', 'users', 'dag_stats')), + # from test_security unit test lambda t: (t[0] == 'remove_table' and t[1].name == 'some_model'), diff --git a/tests/utils/test_email.py b/tests/utils/test_email.py index e6d55cce49706..9bab6430f6214 100644 --- a/tests/utils/test_email.py +++ b/tests/utils/test_email.py @@ -24,15 +24,12 @@ import mock -from airflow import utils from airflow.configuration import conf -from airflow.utils.email import get_email_address_list +from airflow.utils.email_utils import get_email_address_list, send_email, send_email_smtp, send_mime_email from tests.test_utils.config import conf_vars EMAILS = ['test1@example.com', 'test2@example.com'] -send_email_test = mock.MagicMock() - class TestEmail(unittest.TestCase): @@ -81,17 +78,17 @@ def test_get_email_address_invalid_type_in_iterable(self): def setUp(self): conf.remove_option('email', 'EMAIL_BACKEND') - @mock.patch('airflow.utils.email.send_email') + @mock.patch('airflow.utils.email_utils.send_email') def test_default_backend(self, mock_send_email): - res = utils.email.send_email('to', 'subject', 'content') + res = send_email('to', 'subject', 'content') mock_send_email.assert_called_once_with('to', 'subject', 'content') self.assertEqual(mock_send_email.return_value, res) - @mock.patch('airflow.utils.email.send_email_smtp') + @mock.patch('airflow.utils.email_utils.send_email_smtp') def test_custom_backend(self, mock_send_email): with conf_vars({('email', 'email_backend'): 'tests.utils.test_email.send_email_test'}): - utils.email.send_email('to', 'subject', 'content') - send_email_test.assert_called_once_with( + send_email('to', 'subject', 'content') + mock_send_email.assert_called_once_with( 'to', 'subject', 'content', files=None, dryrun=False, cc=None, bcc=None, mime_charset='utf-8', mime_subtype='mixed') self.assertFalse(mock_send_email.called) @@ -101,12 +98,12 @@ class TestEmailSmtp(unittest.TestCase): def setUp(self): conf.set('smtp', 'SMTP_SSL', 'False') - @mock.patch('airflow.utils.email.send_mime_email') + @mock.patch('airflow.utils.email_utils.send_mime_email') def test_send_smtp(self, mock_send_mime): attachment = tempfile.NamedTemporaryFile() attachment.write(b'attachment') attachment.seek(0) - utils.email.send_email_smtp('to', 'subject', 'content', files=[attachment.name]) + send_email_smtp('to', 'subject', 'content', files=[attachment.name]) self.assertTrue(mock_send_mime.called) call_args = mock_send_mime.call_args[0] self.assertEqual(conf.get('smtp', 'SMTP_MAIL_FROM'), call_args[0]) @@ -120,21 +117,21 @@ def test_send_smtp(self, mock_send_mime): mimeapp = MIMEApplication('attachment') self.assertEqual(mimeapp.get_payload(), msg.get_payload()[-1].get_payload()) - @mock.patch('airflow.utils.email.send_mime_email') + @mock.patch('airflow.utils.email_utils.send_mime_email') def test_send_smtp_with_multibyte_content(self, mock_send_mime): - utils.email.send_email_smtp('to', 'subject', '🔥', mime_charset='utf-8') + send_email_smtp('to', 'subject', '🔥', mime_charset='utf-8') self.assertTrue(mock_send_mime.called) call_args = mock_send_mime.call_args[0] msg = call_args[2] mimetext = MIMEText('🔥', 'mixed', 'utf-8') self.assertEqual(mimetext.get_payload(), msg.get_payload()[0].get_payload()) - @mock.patch('airflow.utils.email.send_mime_email') + @mock.patch('airflow.utils.email_utils.send_mime_email') def test_send_bcc_smtp(self, mock_send_mime): attachment = tempfile.NamedTemporaryFile() attachment.write(b'attachment') attachment.seek(0) - utils.email.send_email_smtp('to', 'subject', 'content', files=[attachment.name], cc='cc', bcc='bcc') + send_email_smtp('to', 'subject', 'content', files=[attachment.name], cc='cc', bcc='bcc') self.assertTrue(mock_send_mime.called) call_args = mock_send_mime.call_args[0] self.assertEqual(conf.get('smtp', 'SMTP_MAIL_FROM'), call_args[0]) @@ -154,7 +151,7 @@ def test_send_mime(self, mock_smtp, mock_smtp_ssl): mock_smtp.return_value = mock.Mock() mock_smtp_ssl.return_value = mock.Mock() msg = MIMEMultipart() - utils.email.send_mime_email('from', 'to', msg, dryrun=False) + send_mime_email('from', 'to', msg, dryrun=False) mock_smtp.assert_called_once_with( conf.get('smtp', 'SMTP_HOST'), conf.getint('smtp', 'SMTP_PORT'), @@ -173,7 +170,7 @@ def test_send_mime_ssl(self, mock_smtp, mock_smtp_ssl): mock_smtp.return_value = mock.Mock() mock_smtp_ssl.return_value = mock.Mock() with conf_vars({('smtp', 'smtp_ssl'): 'True'}): - utils.email.send_mime_email('from', 'to', MIMEMultipart(), dryrun=False) + send_mime_email('from', 'to', MIMEMultipart(), dryrun=False) self.assertFalse(mock_smtp.called) mock_smtp_ssl.assert_called_once_with( conf.get('smtp', 'SMTP_HOST'), @@ -189,7 +186,7 @@ def test_send_mime_noauth(self, mock_smtp, mock_smtp_ssl): ('smtp', 'smtp_user'): None, ('smtp', 'smtp_password'): None, }): - utils.email.send_mime_email('from', 'to', MIMEMultipart(), dryrun=False) + send_mime_email('from', 'to', MIMEMultipart(), dryrun=False) self.assertFalse(mock_smtp_ssl.called) mock_smtp.assert_called_once_with( conf.get('smtp', 'SMTP_HOST'), @@ -200,6 +197,6 @@ def test_send_mime_noauth(self, mock_smtp, mock_smtp_ssl): @mock.patch('smtplib.SMTP_SSL') @mock.patch('smtplib.SMTP') def test_send_mime_dryrun(self, mock_smtp, mock_smtp_ssl): - utils.email.send_mime_email('from', 'to', MIMEMultipart(), dryrun=True) + send_mime_email('from', 'to', MIMEMultipart(), dryrun=True) self.assertFalse(mock_smtp.called) self.assertFalse(mock_smtp_ssl.called) diff --git a/tests/utils/test_json.py b/tests/utils/test_json.py index d12d92f783e40..f3bd162756160 100644 --- a/tests/utils/test_json.py +++ b/tests/utils/test_json.py @@ -22,7 +22,7 @@ import numpy as np -from airflow.utils import json as utils_json +from airflow.utils import json_encoder as utils_json class TestAirflowJsonEncoder(unittest.TestCase): diff --git a/tests/www/__init__.py b/tests/www/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/www/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/www/api/__init__.py b/tests/www/api/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/www/api/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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. diff --git a/tests/www/api/experimental/__init__.py b/tests/www/api/experimental/__init__.py deleted file mode 100644 index 217e5db960782..0000000000000 --- a/tests/www/api/experimental/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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 -# -# 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.