Integrate elastic-transport-python library

.ci/run-tests

@@ -8,7 +8,7 @@
 export STACK_VERSION="${STACK_VERSION:=8.0.0-SNAPSHOT}"
 export TEST_SUITE="${TEST_SUITE:=platinum}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
-export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
+export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=urllib3}"
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh

.ci/test-matrix.yml

@@ -9,9 +9,10 @@ PYTHON_VERSION:
   - "3.7"
   - "3.8"
   - "3.9"
+  - "3.10"
 
 PYTHON_CONNECTION_CLASS:
-  - Urllib3HttpConnection
-  - RequestsHttpConnection
+  - urllib3
+  - requests
 
 exclude: ~

dev-requirements.txt

@@ -1,29 +1,24 @@
+git+https://github.com/elastic/elastic-transport-python
+
 requests>=2, <3
+aiohttp
 pytest
 pytest-cov
+pytest-asyncio
 coverage
 mock
 sphinx
 jinja2
 python-dateutil
-
-# Testing the 'search_mvt' API response
-mapbox-vector-tile
+unasync
+pyyaml>=5.4
+isort
+black
+twine
 
 # No wheels for Python 3.10 yet!
 numpy; python_version<"3.10"
 pandas; python_version<"3.10"
 
-# PyYAML 5.3 dropped support for Python 3.4 while
-# not amending that requirement to the package. :(
-pyyaml>=5.4; python_version>="3.6"
-pyyaml<5.3; python_version<"3.6"
-
-isort
-black; python_version>="3.6"
-twine
-
-# Requirements for testing [async] extra
-aiohttp; python_version>="3.6"
-pytest-asyncio; python_version>="3.6"
-unasync; python_version>="3.6"
+# Testing the 'search_mvt' API response
+mapbox-vector-tile; python_version<"3.10"

elasticsearch/__init__.py

@@ -19,30 +19,21 @@
 
 import logging
 import re
-import sys
 import warnings
 
 from ._version import __versionstr__
 
-_major, _minor, _patch = (
-    int(x) for x in re.search(r"^(\d+)\.(\d+)\.(\d+)", __versionstr__).groups()
-)
+_version_groups = re.search(r"^(\d+)\.(\d+)\.(\d+)", __versionstr__).groups()  # type: ignore
+_major, _minor, _patch = (int(x) for x in _version_groups)
 VERSION = __version__ = (_major, _minor, _patch)
 
 logger = logging.getLogger("elasticsearch")
 logger.addHandler(logging.NullHandler())
 
 from ._async.client import AsyncElasticsearch
 from ._sync.client import Elasticsearch
-from .connection import (
-    AIOHttpConnection,
-    AsyncConnection,
-    Connection,
-    RequestsHttpConnection,
-    Urllib3HttpConnection,
-)
-from .connection_pool import ConnectionPool, ConnectionSelector, RoundRobinSelector
 from .exceptions import (
+    ApiError,
     AuthenticationException,
     AuthorizationException,
     ConflictError,
@@ -51,32 +42,24 @@
     ElasticsearchDeprecationWarning,
     ElasticsearchException,
     ElasticsearchWarning,
-    ImproperlyConfigured,
     NotFoundError,
     RequestError,
     SerializationError,
     SSLError,
     TransportError,
     UnsupportedProductError,
 )
-from .serializer import JSONSerializer
-from .transport import AsyncTransport, Transport
+from .serializer import JSONSerializer, JsonSerializer
 
 # Only raise one warning per deprecation message so as not
 # to spam up the user if the same action is done multiple times.
-warnings.simplefilter("default", category=ElasticsearchDeprecationWarning, append=True)
+warnings.simplefilter("default", category=ElasticsearchWarning, append=True)
 
 __all__ = [
+    "ApiError",
+    "AsyncElasticsearch",
     "Elasticsearch",
-    "Transport",
-    "ConnectionPool",
-    "ConnectionSelector",
-    "RoundRobinSelector",
-    "JSONSerializer",
-    "Connection",
-    "RequestsHttpConnection",
-    "Urllib3HttpConnection",
-    "ImproperlyConfigured",
+    "JsonSerializer",
     "ElasticsearchException",
     "SerializationError",
     "TransportError",