Updated code to be compatible with the latest 5.0 upstream code

Author: agronholm

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy-3.10"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -24,7 +24,9 @@ jobs:
     - name: Start external services
       run: docker compose up -d
     - name: Install dependencies
-      run: pip install -e .[test]
+      run: |
+        pip install git+https://github.com/asphalt-framework/asphalt.git
+        pip install -e .[test]
     - name: Test with pytest
       run: coverage run -m pytest -v
     - name: Generate coverage report

docs/conf.py

@@ -7,6 +7,7 @@
     "sphinx.ext.autodoc",
     "sphinx.ext.intersphinx",
     "sphinx_autodoc_typehints",
+    "sphinx_rtd_theme",
 ]
 
 templates_path = ["_templates"]

pyproject.toml

@@ -17,13 +17,13 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "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 :: 3.13",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "asphalt ~= 4.8",
     "aiokafka >= 0.10",
@@ -73,7 +73,7 @@ extend-select = [
 known-first-party = ["asphalt.kafka"]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 strict = true
 explicit_package_bases = true
 mypy_path = ["src", "tests", "examples"]
@@ -90,21 +90,14 @@ branch = true
 show_missing = true
 
 [tool.tox]
-legacy_tox_ini = """
-[tox]
-envlist = py38, py39, py310, py311, py312, pypy3
+env_list = ["py39", "py310", "py311", "py312", "py313", "pypy3"]
 skip_missing_interpreters = true
-minversion = 4.0
 
-[testenv]
-extras = test
-commands = python -m pytest {posargs}
-package = editable
+[tool.tox.env_run_base]
+commands = [["python", "-m", "pytest", { replace = "posargs", extend = true }]]
+package = "editable"
+extras = ["test"]
 
-[testenv:pypy3]
-commands = pytest {posargs}
-
-[testenv:docs]
-extras = doc
-commands = sphinx-build -W -n docs build/sphinx {posargs}
-"""
+[tool.tox.env.docs]
+commands = [["sphinx-build", "-W", "-n", "docs", "build/sphinx", { replace = "posargs", extend = true }]]
+extras = ["doc"]

src/asphalt/kafka/_admin.py

@@ -6,6 +6,7 @@
 from typing import Any
 
 from aiokafka.admin import AIOKafkaAdminClient
+
 from asphalt.core import Component, add_resource, get_resource
 
 
@@ -31,9 +32,7 @@ class KafkaAdminComponent(Component):
     async def start(self) -> None:
         if self.existing_resource is not None:
             if isinstance(self.existing_resource, str):
-                client = await get_resource(
-                    AIOKafkaAdminClient, self.existing_resource, wait=True
-                )
+                client = await get_resource(AIOKafkaAdminClient, self.existing_resource)
             else:
                 client = self.existing_resource
 
@@ -43,7 +42,7 @@ async def start(self) -> None:
             return
 
         if isinstance(self.ssl_context, str):
-            self.options["ssl_context"] = await get_resource(SSLContext, wait=True)
+            self.options["ssl_context"] = await get_resource(SSLContext)
         elif self.ssl_context is not None:
             self.options["ssl_context"] = self.ssl_context
 

src/asphalt/kafka/_consumer.py

@@ -8,6 +8,7 @@
 from typing import Any
 
 from aiokafka import AIOKafkaConsumer
+
 from asphalt.core import Component, add_resource, context_teardown, get_resource
 
 
@@ -35,9 +36,7 @@ class KafkaConsumerComponent(Component):
     async def start(self) -> AsyncGenerator[None, Any]:
         if self.existing_resource is not None:
             if isinstance(self.existing_resource, str):
-                consumer = await get_resource(
-                    AIOKafkaConsumer, self.existing_resource, wait=True
-                )
+                consumer = await get_resource(AIOKafkaConsumer, self.existing_resource)
             else:
                 consumer = self.existing_resource
 
@@ -48,7 +47,7 @@ async def start(self) -> AsyncGenerator[None, Any]:
             return
 
         if isinstance(self.ssl_context, str):
-            self.options["ssl_context"] = await get_resource(SSLContext, wait=True)
+            self.options["ssl_context"] = await get_resource(SSLContext)
         elif self.ssl_context is not None:
             self.options["ssl_context"] = self.ssl_context
 

src/asphalt/kafka/_producer.py

@@ -6,6 +6,7 @@
 from typing import Any
 
 from aiokafka import AIOKafkaProducer
+
 from asphalt.core import Component, add_resource, get_resource
 
 
@@ -28,9 +29,7 @@ class KafkaProducerComponent(Component):
     async def start(self) -> None:
         if self.existing_resource is not None:
             if isinstance(self.existing_resource, str):
-                producer = await get_resource(
-                    AIOKafkaProducer, self.existing_resource, wait=True
-                )
+                producer = await get_resource(AIOKafkaProducer, self.existing_resource)
             else:
                 producer = self.existing_resource
 
@@ -40,7 +39,7 @@ async def start(self) -> None:
             return
 
         if isinstance(self.ssl_context, str):
-            self.options["ssl_context"] = await get_resource(SSLContext, wait=True)
+            self.options["ssl_context"] = await get_resource(SSLContext)
         elif self.ssl_context is not None:
             self.options["ssl_context"] = self.ssl_context