apache-airflow-providers-elasticsearch 6.3.3rc1__tar.gz → 6.3.4rc1__tar.gz

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-elasticsearch
-Version: 6.3.3rc1
+Version: 6.3.4rc1
 Summary: Provider package apache-airflow-providers-elasticsearch for Apache Airflow
 Keywords: airflow-provider,elasticsearch,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -21,11 +21,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0rc1
+Requires-Dist: apache-airflow-providers-common-compat>=1.8.0rc1
 Requires-Dist: apache-airflow-providers-common-sql>=1.27.0rc1
 Requires-Dist: elasticsearch>=8.10,<9
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -56,7 +57,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.3``
+Release: ``6.3.4``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -69,7 +70,7 @@ This is a provider package for ``elasticsearch`` provider. All classes for this
 are in ``airflow.providers.elasticsearch`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/>`_.
 
 Installation
 ------------
@@ -83,13 +84,14 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-=======================================  ==================
-PIP package                              Version required
-=======================================  ==================
-``apache-airflow``                       ``>=2.10.0``
-``apache-airflow-providers-common-sql``  ``>=1.27.0``
-``elasticsearch``                        ``>=8.10,<9``
-=======================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.10.0``
+``apache-airflow-providers-common-compat``  ``>=1.7.4``
+``apache-airflow-providers-common-sql``     ``>=1.27.0``
+``elasticsearch``                           ``>=8.10,<9``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -111,5 +113,5 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html>`_.
 

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.3``
+Release: ``6.3.4``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -36,7 +36,7 @@ This is a provider package for ``elasticsearch`` provider. All classes for this
 are in ``airflow.providers.elasticsearch`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/>`_.
 
 Installation
 ------------
@@ -50,13 +50,14 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-=======================================  ==================
-PIP package                              Version required
-=======================================  ==================
-``apache-airflow``                       ``>=2.10.0``
-``apache-airflow-providers-common-sql``  ``>=1.27.0``
-``elasticsearch``                        ``>=8.10,<9``
-=======================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.10.0``
+``apache-airflow-providers-common-compat``  ``>=1.7.4``
+``apache-airflow-providers-common-sql``     ``>=1.27.0``
+``elasticsearch``                           ``>=8.10,<9``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -78,4 +79,4 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html>`_.

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/docs/changelog.rst

@@ -27,11 +27,27 @@
 Changelog
 ---------
 
-6.3.3
+6.3.4
 .....
 
+Misc
+~~~~
+
+* ``fix mypy type errors in elasticsearch provider for sqlalchemy 2 upgrade (#56818)``
+* ``Migrate Apache providers & Elasticsearch to ''common.compat'' (#57016)``
+
+Doc-only
+~~~~~~~~
+
+* ``Remove placeholder Release Date in changelog and index files (#56056)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Enable PT011 rule to prvoider tests (#56277)``
+
+6.3.3
+.....
 
-Release Date: ``|PypiReleaseDate|``
 
 Bug Fixes
 ~~~~~~~~~

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/docs/index.rst

@@ -79,7 +79,7 @@ apache-airflow-providers-elasticsearch package
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 
-Release: 6.3.3
+Release: 6.3.4
 
 Provider package
 ----------------
@@ -99,13 +99,14 @@ Requirements
 
 The minimum Apache Airflow version supported by this provider distribution is ``2.10.0``.
 
-=======================================  ==================
-PIP package                              Version required
-=======================================  ==================
-``apache-airflow``                       ``>=2.10.0``
-``apache-airflow-providers-common-sql``  ``>=1.27.0``
-``elasticsearch``                        ``>=8.10,<9``
-=======================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.10.0``
+``apache-airflow-providers-common-compat``  ``>=1.7.4``
+``apache-airflow-providers-common-sql``     ``>=1.27.0``
+``elasticsearch``                           ``>=8.10,<9``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -132,5 +133,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-elasticsearch 6.3.3 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3.tar.gz.sha512>`__)
-* `The apache-airflow-providers-elasticsearch 6.3.3 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.3-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.4 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4.tar.gz.sha512>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.4 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.4-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 state: ready
-source-date-epoch: 1757950241
+source-date-epoch: 1761116667
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 6.3.4
   - 6.3.3
   - 6.3.2
   - 6.3.1

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-elasticsearch"
-version = "6.3.3rc1"
+version = "6.3.4rc1"
 description = "Provider package apache-airflow-providers-elasticsearch for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0rc1",
+    "apache-airflow-providers-common-compat>=1.8.0rc1",
     "apache-airflow-providers-common-sql>=1.27.0rc1",
     "elasticsearch>=8.10,<9",
 ]
@@ -67,6 +68,7 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     "apache-airflow-providers-common-sql",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
     "apache-airflow-providers-common-sql[pandas,polars]",
@@ -98,8 +100,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/src/airflow/providers/elasticsearch/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "6.3.3"
+__version__ = "6.3.4"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/src/airflow/providers/elasticsearch/hooks/elasticsearch.py

@@ -25,8 +25,8 @@ from urllib import parse
 
 from elasticsearch import Elasticsearch
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.elasticsearch.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/src/airflow/providers/elasticsearch/log/es_task_handler.py

@@ -41,23 +41,15 @@ from elasticsearch.exceptions import NotFoundError
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.models.dagrun import DagRun
+from airflow.providers.common.compat.sdk import timezone
 from airflow.providers.elasticsearch.log.es_json_formatter import ElasticsearchJSONFormatter
 from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit
-from airflow.providers.elasticsearch.version_compat import (
-    AIRFLOW_V_3_0_PLUS,
-    AIRFLOW_V_3_1_PLUS,
-    EsLogMsgType,
-)
+from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
 from airflow.utils.module_loading import import_string
 from airflow.utils.session import create_session
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import timezone
-else:
-    from airflow.utils import timezone  # type: ignore[attr-defined,no-redef]
-
 if TYPE_CHECKING:
     from datetime import datetime
 
@@ -65,6 +57,14 @@ if TYPE_CHECKING:
     from airflow.utils.log.file_task_handler import LogMetadata
 
 
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.utils.log.file_task_handler import StructuredLogMessage
+
+    EsLogMsgType = list[StructuredLogMessage] | str
+else:
+    EsLogMsgType = list[tuple[str, str]]  # type: ignore[assignment,misc]
+
+
 LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
 # Elasticsearch hosted log type
 
@@ -252,15 +252,11 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
             data_interval_end = self._clean_date(dag_run.data_interval_end)
             logical_date = self._clean_date(dag_run.logical_date)
         else:
-            if dag_run.data_interval_start:
-                data_interval_start = dag_run.data_interval_start.isoformat()
-            else:
-                data_interval_start = ""
-            if dag_run.data_interval_end:
-                data_interval_end = dag_run.data_interval_end.isoformat()
-            else:
-                data_interval_end = ""
-            logical_date = dag_run.logical_date.isoformat()
+            data_interval_start = (
+                dag_run.data_interval_start.isoformat() if dag_run.data_interval_start else ""
+            )
+            data_interval_end = dag_run.data_interval_end.isoformat() if dag_run.data_interval_end else ""
+            logical_date = dag_run.logical_date.isoformat() if dag_run.logical_date else ""
 
         return log_id_template.format(
             dag_id=ti.dag_id,

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/src/airflow/providers/elasticsearch/version_compat.py

@@ -35,16 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.utils.log.file_task_handler import StructuredLogMessage
-
-    EsLogMsgType = list[StructuredLogMessage] | str
-else:
-    EsLogMsgType = list[tuple[str, str]]  # type: ignore[assignment,misc]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "EsLogMsgType"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/tests/system/elasticsearch/example_elasticsearch_query.py

@@ -24,17 +24,10 @@ import os
 from datetime import datetime
 
 from airflow import models
+from airflow.providers.common.compat.sdk import task
 from airflow.providers.elasticsearch.hooks.elasticsearch import ElasticsearchPythonHook, ElasticsearchSQLHook
 from airflow.providers.standard.operators.python import PythonOperator
 
-from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import task
-else:
-    # Airflow 2 path
-    from airflow.decorators import task  # type: ignore[attr-defined,no-redef]
-
 ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID")
 DAG_ID = "elasticsearch_dag"
 CONN_ID = "elasticsearch_default"

{apache_airflow_providers_elasticsearch-6.3.3rc1 → apache_airflow_providers_elasticsearch-6.3.4rc1}/tests/unit/elasticsearch/log/test_es_task_handler.py

@@ -162,7 +162,7 @@ class TestElasticsearchTaskHandler:
         Test the format_url method of the ElasticsearchTaskHandler class.
         """
         if expected == "ValueError":
-            with pytest.raises(ValueError):
+            with pytest.raises(ValueError, match="'https://' is not a valid URL."):
                 assert ElasticsearchTaskHandler.format_url(host) == expected
         else:
             assert ElasticsearchTaskHandler.format_url(host) == expected