Fix CI

.github/workflows/ci.yml

@@ -39,10 +39,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        os: ["ubuntu-latest"]
         experimental: [false]
+        include:
+          - python-version: "3.6"
+            experimental: false
+            os: ubuntu-20.04
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     name: test-${{ matrix.python-version }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
@@ -54,11 +59,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Set up Python 3.7 to run nox
-        if: matrix.python-version != '3.7'
+      - name: Set up Python 3.x to run nox
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.x
 
       - name: Install Dependencies
         run: python -m pip install --upgrade nox
@@ -67,10 +71,7 @@ jobs:
         run: "nox -rs test-${PYTHON_VERSION%-dev}"
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
-          # TEMPORARY for 3.11
-          # https://github.com/aio-libs/aiohttp/issues/6600
+          # Required for development versions of Python
           AIOHTTP_NO_EXTENSIONS: 1
-          # https://github.com/aio-libs/frozenlist/issues/285
           FROZENLIST_NO_EXTENSIONS: 1
-          # https://github.com/aio-libs/yarl/issues/680
           YARL_NO_EXTENSIONS: 1

elastic_transport/_async_transport.py

@@ -244,7 +244,6 @@ async def perform_request(  # type: ignore[override,return]
         errors: List[Exception] = []
 
         for attempt in range(max_retries + 1):
-
             # If we sniff before requests are made we want to do so before
             # 'node_pool.get()' is called so our sniffed nodes show up in the pool.
             if self._sniff_before_requests:

elastic_transport/_node/_http_requests.py

@@ -61,7 +61,6 @@ def init_poolmanager(
             block: bool = False,
             **pool_kwargs: Any,
         ) -> None:
-
             if self._node_config.scheme == "https":
                 ssl_context = ssl_context_from_node_config(self._node_config)
                 pool_kwargs.setdefault("ssl_context", ssl_context)
@@ -71,7 +70,6 @@ def init_poolmanager(
                 # about the fingerprint of the certificates, not whether they form
                 # a verified chain to a trust anchor.
                 if self._node_config.ssl_assert_fingerprint:
-
                     # Manually disable these in the right order on the SSLContext
                     # so urllib3 won't think we want conflicting things.
                     ssl_context.check_hostname = False

elastic_transport/_node/_http_urllib3.py

@@ -70,7 +70,6 @@ def __init__(self, config: NodeConfig):
             # about the fingerprint of the certificates, not whether they form
             # a verified chain to a trust anchor.
             elif config.ssl_assert_fingerprint:
-
                 # Manually disable these in the right order on the SSLContext
                 # so urllib3 won't think we want conflicting things.
                 ssl_context.check_hostname = False
@@ -137,7 +136,6 @@ def perform_request(
         headers: Optional[HttpHeaders] = None,
         request_timeout: Union[DefaultType, Optional[float]] = DEFAULT,
     ) -> NodeApiResponse:
-
         if self.path_prefix:
             target = f"{self.path_prefix}{target}"
 

elastic_transport/_transport.py

@@ -314,7 +314,6 @@ def perform_request(  # type: ignore[return]
         errors: List[Exception] = []
 
         for attempt in range(max_retries + 1):
-
             # If we sniff before requests are made we want to do so before
             # 'node_pool.get()' is called so our sniffed nodes show up in the pool.
             if self._sniff_before_requests:

elastic_transport/client_utils.py

@@ -198,7 +198,7 @@ def url_to_node_config(
 
     # Only fill in a default port for HTTP and HTTPS
     # when we know the scheme is one of those two.
-    parsed_port: Optional[int] = parsed_url.port  # type: ignore[assignment]
+    parsed_port: Optional[int] = parsed_url.port
     if (
         parsed_url.port is None
         and parsed_url.scheme is not None

noxfile.py

@@ -29,7 +29,7 @@
 
 @nox.session()
 def format(session):
-    session.install("black", "isort", "pyupgrade")
+    session.install("black~=23.0", "isort", "pyupgrade")
     session.run("black", "--target-version=py36", *SOURCE_FILES)
     session.run("isort", *SOURCE_FILES)
     session.run("python", "utils/license-headers.py", "fix", *SOURCE_FILES)
@@ -40,7 +40,13 @@ def format(session):
 @nox.session
 def lint(session):
     session.install(
-        "flake8", "black", "isort", "mypy", "types-requests", "types-certifi"
+        "flake8",
+        "black~=23.0",
+        "isort",
+        "mypy==1.0.1",
+        "types-urllib3",
+        "types-requests",
+        "types-certifi",
     )
     session.install(".[develop]")
     session.run("black", "--check", "--target-version=py36", *SOURCE_FILES)
@@ -50,7 +56,7 @@ def lint(session):
     session.run("mypy", "--strict", "--show-error-codes", "elastic_transport/")
 
 
-@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"])
 def test(session):
     session.install(".[develop]")
     session.run(

setup.py

@@ -80,6 +80,8 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],