Support Python 3.6 to 3.11

Author: pquentin

.buildkite/pipeline.yml

@@ -10,7 +10,6 @@ steps:
     matrix:
       setup:
         python:
-          - "2.7"
           - "3.6"
           - "3.7"
           - "3.8"

.github/workflows/ci.yml

@@ -23,24 +23,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         experimental: [false]
         runs-on: ["ubuntu-latest"]
         include:
-          - python-version: 2.7
-            experimental: false
-            runs-on: "ubuntu-20.04"
-          - python-version: 3.5
-            experimental: false
-            runs-on: "ubuntu-20.04"
           - python-version: 3.6
             experimental: false
             runs-on: "ubuntu-20.04"
 
-          - python-version: 3.11
-            experimental: true
-            runs-on: "ubuntu-20.04"
-
     runs-on: ${{ matrix.runs-on }}
     name: test-${{ matrix.python-version }}
     continue-on-error: ${{ matrix.experimental }}
@@ -55,5 +45,8 @@ jobs:
         run: |
           python -m pip install -r dev-requirements.txt
       - name: Run Tests
-        run: |
-          python setup.py test
+        run: python setup.py test
+        env:
+          # Workaround for development versions of Python
+          # https://github.com/aio-libs/aiohttp/issues/7675
+          AIOHTTP_NO_EXTENSIONS: 1

dev-requirements.txt

@@ -7,26 +7,18 @@ sphinx
 jinja2
 python-dateutil
 
-# Testing the 'search_mvt' API response
-mapbox-vector-tile; python_version!="3.4.*"
-# For mapbox-vector-tile, package broke Python 2 support without an annotation.
-# See: protocolbuffers/protobuf#8984
-protobuf<3.18; python_version!="3.4.*"
+mapbox-vector-tile
 
-# No wheels for Python 3.10 yet!
-numpy; python_version<"3.10"
-pandas; python_version<"3.10"
+numpy
+pandas
 
-# 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"
+pyyaml>=5.4
 
 isort
-black; python_version>="3.6"
+black
 twine
 
 # Requirements for testing [async] extra
-aiohttp; python_version>="3.6"
-pytest-asyncio; python_version>="3.6"
-unasync; python_version>="3.6"
+aiohttp
+pytest-asyncio
+unasync

elasticsearch/__init__.py

@@ -88,10 +88,6 @@
 ]
 
 try:
-    # Asyncio only supported on Python 3.6+
-    if sys.version_info < (3, 6):
-        raise ImportError
-
     from ._async.client import AsyncElasticsearch
     from ._async.http_aiohttp import AIOHttpConnection, AsyncConnection
     from ._async.transport import AsyncTransport
@@ -104,13 +100,3 @@
     ]
 except (ImportError, SyntaxError):
     pass
-
-# Python earlier than 3.6 is deprecated and will be removed in 8.0.0
-if sys.version_info < (3, 6):
-    warnings.warn(
-        "Support for Python 3.5 and earlier is deprecated and will be removed "
-        "in v8.0.0 (current instance is Python %d.%d) See https://github.com/elastic"
-        "/elasticsearch-py/issues/1696 for details." % sys.version_info[:2],
-        category=DeprecationWarning,
-        stacklevel=2,
-    )

elasticsearch/client/utils.py

@@ -25,7 +25,7 @@
 from functools import wraps
 
 from .._version import __versionstr__
-from ..compat import PY2, quote, string_types, to_bytes, to_str, unquote, urlparse
+from ..compat import quote, string_types, to_bytes, to_str, unquote, urlparse
 
 # parts of URL to be omitted
 SKIP_IN_PATH = (None, "", b"", [], ())
@@ -105,9 +105,7 @@ def _escape(value):
 
     # encode strings to utf-8
     if isinstance(value, string_types):
-        if PY2 and isinstance(value, unicode):  # noqa: F821
-            return value.encode("utf-8")
-        if not PY2 and isinstance(value, str):
+        if isinstance(value, str):
             return value.encode("utf-8")
 
     return str(value)

elasticsearch/compat.py

@@ -15,60 +15,30 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import sys
+import asyncio
 
-PY2 = sys.version_info[0] == 2
+string_types = str, bytes
+from urllib.parse import quote, quote_plus, unquote, urlencode, urlparse
 
-if PY2:
-    string_types = (basestring,)  # noqa: F821
-    from itertools import imap as map
-    from urllib import quote, quote_plus, unquote, urlencode
+map = map
+from queue import Queue
 
-    from Queue import Queue
-    from urlparse import urlparse
 
-    def to_str(x, encoding="ascii"):
-        if not isinstance(x, str):
-            return x.encode(encoding)
-        return x
+def to_str(x, encoding="ascii"):
+    if not isinstance(x, str):
+        return x.decode(encoding)
+    return x
 
-    to_bytes = to_str
 
-else:
-    string_types = str, bytes
-    from urllib.parse import quote, quote_plus, unquote, urlencode, urlparse
+def to_bytes(x, encoding="ascii"):
+    if not isinstance(x, bytes):
+        return x.encode(encoding)
+    return x
 
-    map = map
-    from queue import Queue
 
-    def to_str(x, encoding="ascii"):
-        if not isinstance(x, str):
-            return x.decode(encoding)
-        return x
+from collections.abc import Mapping
 
-    def to_bytes(x, encoding="ascii"):
-        if not isinstance(x, bytes):
-            return x.encode(encoding)
-        return x
-
-
-try:
-    from collections.abc import Mapping
-except ImportError:
-    from collections import Mapping
-
-
-try:
-    reraise_exceptions = (RecursionError,)
-except NameError:
-    reraise_exceptions = ()
-
-try:
-    import asyncio
-
-    reraise_exceptions += (asyncio.CancelledError,)
-except (ImportError, AttributeError):
-    pass
+reraise_exceptions = (RecursionError, asyncio.CancelledError)
 
 try:
     from threading import Lock

elasticsearch/compat.pyi

@@ -18,7 +18,6 @@
 import sys
 from typing import Callable, Tuple, Type, Union
 
-PY2: bool
 string_types: Tuple[type, ...]
 
 to_str: Callable[[Union[str, bytes]], str]

elasticsearch/connection/base.py

@@ -29,7 +29,6 @@
     import json
 
 from .. import __versionstr__
-from ..compat import PY2
 from ..exceptions import (
     HTTP_EXCEPTIONS,
     ElasticsearchWarning,
@@ -259,9 +258,6 @@ def log_request_success(
             except AttributeError:
                 pass
 
-        if response is not None:
-            response = loggable_response_body(response)
-
         logger.info(
             "%s %s [status:%s request:%.3fs]", method, full_url, status_code, duration
         )
@@ -302,9 +298,6 @@ def log_request_fail(
             except AttributeError:
                 pass
 
-        if response is not None:
-            response = loggable_response_body(response)
-
         logger.debug("> %s", body)
 
         self._log_trace(method, path, body, status_code, response, duration)
@@ -342,18 +335,3 @@ def _get_api_key_header_val(self, api_key):
             s = "{0}:{1}".format(api_key[0], api_key[1]).encode("utf-8")
             return "ApiKey " + binascii.b2a_base64(s).rstrip(b"\r\n").decode("utf-8")
         return "ApiKey " + api_key
-
-
-def loggable_response_body(response):
-    # If 'response' isn't unicode we need to try converting it to
-    # unicode otherwise it's likely binary so should be encoded
-    # properly. On Python 3.x this works out fine.
-    if PY2 and not isinstance(response, unicode):  # noqa
-        try:
-            response = response.decode("utf-8")
-        except (AttributeError, UnicodeError):
-            # Encodes unprintable characters to '\xXX' hex
-            # like how is done in Python 3.x in bytes.__repr__
-            response = u"b" + repr(response).decode("utf-8")
-
-    return response

elasticsearch/helpers/__init__.py

@@ -17,6 +17,7 @@
 
 import sys
 
+from .._async.helpers import async_bulk, async_reindex, async_scan, async_streaming_bulk
 from .actions import (
     _chunk_actions,
     _process_bulk_chunk,
@@ -40,21 +41,8 @@
     "reindex",
     "_chunk_actions",
     "_process_bulk_chunk",
+    "async_scan",
+    "async_bulk",
+    "async_reindex",
+    "async_streaming_bulk",
 ]
-
-
-try:
-    # Asyncio only supported on Python 3.6+
-    if sys.version_info < (3, 6):
-        raise ImportError
-
-    from .._async.helpers import (
-        async_bulk,
-        async_reindex,
-        async_scan,
-        async_streaming_bulk,
-    )
-
-    __all__ += ["async_scan", "async_bulk", "async_reindex", "async_streaming_bulk"]
-except (ImportError, SyntaxError):
-    pass

elasticsearch/helpers/__init__.pyi

@@ -17,6 +17,10 @@
 
 import sys
 
+from .._async.helpers import async_bulk as async_bulk
+from .._async.helpers import async_reindex as async_reindex
+from .._async.helpers import async_scan as async_scan
+from .._async.helpers import async_streaming_bulk as async_streaming_bulk
 from .actions import _chunk_actions as _chunk_actions
 from .actions import _process_bulk_chunk as _process_bulk_chunk
 from .actions import bulk as bulk
@@ -27,15 +31,3 @@ from .actions import scan as scan
 from .actions import streaming_bulk as streaming_bulk
 from .errors import BulkIndexError as BulkIndexError
 from .errors import ScanError as ScanError
-
-try:
-    # Asyncio only supported on Python 3.6+
-    if sys.version_info < (3, 6):
-        raise ImportError
-
-    from .._async.helpers import async_bulk as async_bulk
-    from .._async.helpers import async_reindex as async_reindex
-    from .._async.helpers import async_scan as async_scan
-    from .._async.helpers import async_streaming_bulk as async_streaming_bulk
-except (ImportError, SyntaxError):
-    pass

noxfile.py

@@ -26,7 +26,7 @@
 )
 
 
-@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"])
 def test(session):
     session.install(".")
     session.install("-r", "dev-requirements.txt")

setup.py

@@ -95,19 +95,17 @@
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
+    python_requires=">=3.6",
     install_requires=install_requires,
     test_suite="test_elasticsearch.run_tests.run_all",
     tests_require=tests_require,

test_elasticsearch/run_tests.py

@@ -94,10 +94,6 @@ def run_all(argv=None):
         ]
 
         ignores = []
-        # Python 3.6+ is required for async
-        if sys.version_info < (3, 6):
-            ignores.append("test_elasticsearch/test_async/")
-
         # GitHub Actions, run non-server tests
         if "GITHUB_ACTION" in environ:
             ignores.extend(

test_elasticsearch/test_client/test_utils.py

@@ -24,7 +24,6 @@
 import pytest
 
 from elasticsearch.client.utils import _bulk_body, _escape, _make_path, query_params
-from elasticsearch.compat import PY2
 
 from ..test_cases import SkipTest, TestCase
 
@@ -446,14 +445,6 @@ def test_handles_unicode(self):
             "/some-index/type/%E4%B8%AD%E6%96%87", _make_path("some-index", "type", id)
         )
 
-    def test_handles_utf_encoded_string(self):
-        if not PY2:
-            raise SkipTest("Only relevant for py2")
-        id = "中文".encode("utf-8")
-        self.assertEqual(
-            "/some-index/type/%E4%B8%AD%E6%96%87", _make_path("some-index", "type", id)
-        )
-
 
 class TestEscape(TestCase):
     def test_handles_ascii(self):