diff --git a/dev-requirements.txt b/dev-requirements.txt index ac700ce..cb607f3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,9 +5,9 @@ pytest pytest-cov pytest-sugar pytest-aiohttp +pytest-asyncio codecov sphinx sphinx_issues sphinx_rtd_theme isort -typed-ast diff --git a/readthedocs.yaml b/readthedocs.yaml index 231f6fc..c29b6ad 100644 --- a/readthedocs.yaml +++ b/readthedocs.yaml @@ -2,7 +2,7 @@ build: image: latest python: - version: 3.6 + version: 3.11 setup_py_install: true requirements_file: dev-requirements.txt diff --git a/requirements.txt b/requirements.txt index 6d9eefb..ec25da6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp>=3.0.1,<4.0 -apispec>=5.1.1 -webargs>=8.0.1 +aiohttp>=3.12.2,<4.0 +apispec>=6.8.3 +webargs>=8.7.0 jinja2 diff --git a/setup.py b/setup.py index 255b6ad..ca02394 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ def read(file_name): setup( name='aiohttp-apispec', - version='3.0.0b2', + version='3.1.0b1', description='Build and document REST APIs with aiohttp and apispec', long_description=read('README.md'), long_description_content_type="text/markdown", @@ -23,15 +23,17 @@ def read(file_name): url='https://github.com/maximdanilchenko/aiohttp-apispec', zip_safe=False, keywords='aiohttp marshmallow apispec swagger', - python_requires='>=3.6', + python_requires='>=3.9', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - '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 :: 3.12', + 'Programming Language :: Python :: 3.13', ], test_suite='tests', ) diff --git a/tests/conftest.py b/tests/conftest.py index d40de32..846558f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -85,7 +85,7 @@ def example_for_request_schema(): ({"location": "querystring"}, False), ] ) -def aiohttp_app(loop, aiohttp_client, request, example_for_request_schema): +async def aiohttp_app(aiohttp_client, request, example_for_request_schema): location, nested = request.param @docs( @@ -235,4 +235,4 @@ async def validated_view(request: web.Request): ) app.middlewares.extend([intercept_error, validation_middleware]) - return loop.run_until_complete(aiohttp_client(app)) + return await aiohttp_client(app) diff --git a/tests/pytest.ini b/tests/pytest.ini index a7f0388..68c119e 100644 --- a/tests/pytest.ini +++ b/tests/pytest.ini @@ -1,2 +1,3 @@ [pytest] addopts = -v --cov aiohttp_apispec +asyncio_mode = auto