Move e-mail operator to core

airflow/operators/email_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.email.operators.email`."""
+"""This module is deprecated. Please use `airflow.operators.email`."""
 
 import warnings
 
 # pylint: disable=unused-import
-from airflow.providers.email.operators.email import EmailOperator  # noqa
+from airflow.operators.email import EmailOperator  # noqa
 
 warnings.warn(
-    "This module is deprecated. Please use `airflow.providers.email.operators.email`.",
+    "This module is deprecated. Please use `airflow.operators.email`.",
     DeprecationWarning, stacklevel=2
 )

docs/autoapi_templates/index.rst

@@ -114,8 +114,6 @@ All operators are in the following packages:
 
   airflow/providers/docker/operators/index
 
-  airflow/providers/email/operators/index
-
   airflow/providers/exasol/operators/index
 
   airflow/providers/ftp/sensors/index

docs/concepts.rst

@@ -380,7 +380,7 @@ Airflow provides operators for many common tasks, including:
 
 - :class:`~airflow.operators.bash.BashOperator` - executes a bash command
 - :class:`~airflow.operators.python.PythonOperator` - calls an arbitrary Python function
-- :class:`~airflow.providers.email.operators.email.EmailOperator` - sends an email
+- :class:`~airflow.operators.email.EmailOperator` - sends an email
 - :class:`~airflow.providers.http.operators.http.SimpleHttpOperator` - sends an HTTP request
 - :class:`~airflow.providers.mysql.operators.mysql.MySqlOperator`,
   :class:`~airflow.providers.sqlite.operators.sqlite.SqliteOperator`,

docs/operators-and-hooks-ref.rst

@@ -57,12 +57,16 @@ Fundamentals
 
    * - :mod:`airflow.operators.branch_operator`
      -
+
    * - :mod:`airflow.operators.dagrun_operator`
      -
 
    * - :mod:`airflow.operators.dummy_operator`
      -
 
+   * - :mod:`airflow.operators.email`
+     -
+
    * - :mod:`airflow.operators.generic_transfer`
      -
 
@@ -1598,12 +1602,6 @@ communication protocols or interface.
      - :mod:`airflow.providers.ssh.operators.ssh`
      -
 
-   * - `Simple Mail Transfer Protocol (SMTP) <https://tools.ietf.org/html/rfc821>`__
-     -
-     -
-     - :mod:`airflow.providers.email.operators.email`
-     -
-
    * - `Windows Remote Management (WinRM) <https://docs.microsoft.com/en-gb/windows/win32/winrm/portal>`__
      -
      - :mod:`airflow.providers.microsoft.winrm.hooks.winrm`

setup.py

@@ -510,7 +510,6 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version
     "discord": [],
     "docker": docker,
     "elasticsearch": [],
-    "email": [],
     "exasol": exasol,
     "facebook": facebook,
     "ftp": [],

tests/deprecated_classes.py

@@ -1268,7 +1268,7 @@
         'airflow.contrib.operators.winrm_operator.WinRMOperator',
     ),
     (
-        'airflow.providers.email.operators.email.EmailOperator',
+        'airflow.operators.email.EmailOperator',
         'airflow.operators.email_operator.EmailOperator',
     ),
     (

tests/providers/email/operators/test_email.py → tests/operators/test_email.py

@@ -21,7 +21,7 @@
 from unittest import mock
 
 from airflow.models.dag import DAG
-from airflow.providers.email.operators.email import EmailOperator
+from airflow.operators.email import EmailOperator
 from airflow.utils import timezone
 from tests.test_utils.config import conf_vars
 
@@ -57,7 +57,7 @@ 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.operators.test_email.send_email_test'}
         ):
             self._run_as_operator()
         assert send_email_test.call_count == 1