diff --git a/docs/tutorials/aiohttp.rst b/docs/tutorials/aiohttp.rst index 2eb1216f..77de49a1 100644 --- a/docs/tutorials/aiohttp.rst +++ b/docs/tutorials/aiohttp.rst @@ -261,7 +261,7 @@ You should see: Content-Length: 844 Content-Type: application/json; charset=utf-8 Date: Wed, 29 Jul 2020 21:01:50 GMT - Server: Python/3.8 aiohttp/3.6.2 + Server: Python/3.9 aiohttp/3.6.2 { "gifs": [], @@ -605,7 +605,7 @@ You should see: Content-Length: 492 Content-Type: application/json; charset=utf-8 Date: Fri, 09 Oct 2020 01:35:48 GMT - Server: Python/3.8 aiohttp/3.6.2 + Server: Python/3.9 aiohttp/3.6.2 { "gifs": [ @@ -810,13 +810,13 @@ You should see: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: cov-2.10.0, aiohttp-0.3.0, asyncio-0.14.0 collected 3 items giphynavigator/tests.py ... [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover --------------------------------------------------- giphynavigator/__init__.py 0 0 100% diff --git a/docs/tutorials/asyncio-daemon.rst b/docs/tutorials/asyncio-daemon.rst index 0a8098d5..2a1af73f 100644 --- a/docs/tutorials/asyncio-daemon.rst +++ b/docs/tutorials/asyncio-daemon.rst @@ -129,7 +129,7 @@ Put next lines into the ``requirements.txt`` file: pytest-cov Second, we need to create the ``Dockerfile``. It will describe the daemon's build process and -specify how to run it. We will use ``python:3.8-buster`` as a base image. +specify how to run it. We will use ``python:3.9-buster`` as a base image. Put next lines into the ``Dockerfile`` file: @@ -980,14 +980,14 @@ You should see: .. code-block:: bash - platform linux -- Python 3.8.3, pytest-6.0.1, py-1.9.0, pluggy-0.13.1 + platform linux -- Python 3.9, pytest-6.0.1, py-1.9.0, pluggy-0.13.1 rootdir: /code plugins: asyncio-0.14.0, cov-2.10.0 collected 2 items monitoringdaemon/tests.py .. [100%] - ----------- coverage: platform linux, python 3.8.3-final-0 ----------- + ----------- coverage: platform linux, python 3.9 ----------- Name Stmts Miss Cover ---------------------------------------------------- monitoringdaemon/__init__.py 0 0 100% diff --git a/docs/tutorials/cli.rst b/docs/tutorials/cli.rst index 2589777c..980593a0 100644 --- a/docs/tutorials/cli.rst +++ b/docs/tutorials/cli.rst @@ -1010,13 +1010,13 @@ You should see: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: cov-2.10.0 collected 2 items movies/tests.py .. [100%] - ---------- coverage: platform darwin, python 3.8.5-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover ------------------------------------------ movies/__init__.py 0 0 100% diff --git a/docs/tutorials/flask.rst b/docs/tutorials/flask.rst index 2784cd98..3abf7c66 100644 --- a/docs/tutorials/flask.rst +++ b/docs/tutorials/flask.rst @@ -960,13 +960,13 @@ You should see: .. code-block:: bash - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: flask-1.0.0, cov-2.10.0 collected 2 items githubnavigator/tests.py .. [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover ---------------------------------------------------- githubnavigator/__init__.py 0 0 100% diff --git a/examples/miniapps/aiohttp/README.rst b/examples/miniapps/aiohttp/README.rst index 9341e5c3..962812f8 100644 --- a/examples/miniapps/aiohttp/README.rst +++ b/examples/miniapps/aiohttp/README.rst @@ -98,13 +98,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: cov-2.10.0, aiohttp-0.3.0, asyncio-0.14.0 collected 3 items giphynavigator/tests.py ... [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover --------------------------------------------------- giphynavigator/__init__.py 0 0 100% diff --git a/examples/miniapps/asyncio-daemon/README.rst b/examples/miniapps/asyncio-daemon/README.rst index b6a45c79..07a40866 100644 --- a/examples/miniapps/asyncio-daemon/README.rst +++ b/examples/miniapps/asyncio-daemon/README.rst @@ -65,14 +65,14 @@ The output should be something like: .. code-block:: - platform linux -- Python 3.8.3, pytest-6.0.1, py-1.9.0, pluggy-0.13.1 + platform linux -- Python 3.9, pytest-6.0.1, py-1.9.0, pluggy-0.13.1 rootdir: /code plugins: asyncio-0.14.0, cov-2.10.0 collected 2 items monitoringdaemon/tests.py .. [100%] - ----------- coverage: platform linux, python 3.8.3-final-0 ----------- + ----------- coverage: platform linux, python 3.9 ----------- Name Stmts Miss Cover ---------------------------------------------------- monitoringdaemon/__init__.py 0 0 100% diff --git a/examples/miniapps/fastapi-redis/Dockerfile b/examples/miniapps/fastapi-redis/Dockerfile index 4adbf329..932c3d6c 100644 --- a/examples/miniapps/fastapi-redis/Dockerfile +++ b/examples/miniapps/fastapi-redis/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-buster +FROM python:3.9-buster ENV PYTHONUNBUFFERED=1 diff --git a/examples/miniapps/fastapi-redis/README.rst b/examples/miniapps/fastapi-redis/README.rst index 4871fd2f..2daa0f4b 100644 --- a/examples/miniapps/fastapi-redis/README.rst +++ b/examples/miniapps/fastapi-redis/README.rst @@ -69,14 +69,14 @@ The output should be something like: .. code-block:: - platform linux -- Python 3.8.6, pytest-6.2.1, py-1.10.0, pluggy-0.13.1 + platform linux -- Python 3.9, pytest-6.2.1, py-1.10.0, pluggy-0.13.1 rootdir: /code plugins: cov-2.10.1, asyncio-0.14.0 collected 1 item fastapiredis/tests.py . [100%] - ----------- coverage: platform linux, python 3.8.6-final-0 ----------- + ----------- coverage: platform linux, python 3.9 ----------- Name Stmts Miss Cover ------------------------------------------------- fastapiredis/__init__.py 0 0 100% diff --git a/examples/miniapps/fastapi/README.rst b/examples/miniapps/fastapi/README.rst index eaaee20b..3191465f 100644 --- a/examples/miniapps/fastapi/README.rst +++ b/examples/miniapps/fastapi/README.rst @@ -101,13 +101,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: cov-2.10.0, asyncio-0.14.0 collected 3 items giphynavigator/tests.py ... [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover --------------------------------------------------- giphynavigator/__init__.py 0 0 100% diff --git a/examples/miniapps/flask-blueprints/README.rst b/examples/miniapps/flask-blueprints/README.rst index 355fc2af..396f7e1e 100644 --- a/examples/miniapps/flask-blueprints/README.rst +++ b/examples/miniapps/flask-blueprints/README.rst @@ -81,13 +81,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: flask-1.0.0, cov-2.10.0 collected 2 items githubnavigator/tests.py .. [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover ---------------------------------------------------- githubnavigator/__init__.py 0 0 100% diff --git a/examples/miniapps/flask/README.rst b/examples/miniapps/flask/README.rst index d825a81e..c00e8307 100644 --- a/examples/miniapps/flask/README.rst +++ b/examples/miniapps/flask/README.rst @@ -81,13 +81,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: flask-1.0.0, cov-2.10.0 collected 2 items githubnavigator/tests.py .. [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover ---------------------------------------------------- githubnavigator/__init__.py 0 0 100% diff --git a/examples/miniapps/movie-lister/README.rst b/examples/miniapps/movie-lister/README.rst index cdcbc20c..9cb0f874 100644 --- a/examples/miniapps/movie-lister/README.rst +++ b/examples/miniapps/movie-lister/README.rst @@ -58,13 +58,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-5.4.3, py-1.9.0, pluggy-0.13.1 plugins: cov-2.10.0 collected 2 items movies/tests.py .. [100%] - ---------- coverage: platform darwin, python 3.8.5-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover ------------------------------------------ movies/__init__.py 0 0 100% diff --git a/examples/miniapps/sanic/README.rst b/examples/miniapps/sanic/README.rst index d8329012..bbe4859b 100644 --- a/examples/miniapps/sanic/README.rst +++ b/examples/miniapps/sanic/README.rst @@ -98,13 +98,13 @@ The output should be something like: .. code-block:: - platform darwin -- Python 3.9.5, pytest-6.2.2, py-1.10.0, pluggy-0.13.1 + platform darwin -- Python 3.9, pytest-6.2.2, py-1.10.0, pluggy-0.13.1 plugins: cov-2.12.1, sanic-1.8.1, anyio-3.3.2 collected 3 items giphynavigator/tests.py ... [100%] - ---------- coverage: platform darwin, python 3.8.3-final-0 ----------- + ---------- coverage: platform darwin, python 3.9 ----------- Name Stmts Miss Cover --------------------------------------------------- giphynavigator/__init__.py 0 0 100% diff --git a/setup.py b/setup.py index 0a47d594..0f86fff1 100644 --- a/setup.py +++ b/setup.py @@ -8,111 +8,111 @@ from setuptools import setup, Extension # Defining setup variables: defined_macros = dict() -defined_macros['CYTHON_CLINE_IN_TRACEBACK'] = 0 +defined_macros["CYTHON_CLINE_IN_TRACEBACK"] = 0 # Getting description: -with open('README.rst') as readme_file: +with open("README.rst") as readme_file: description = readme_file.read() # Getting requirements: -with open('requirements.txt') as requirements_file: +with open("requirements.txt") as requirements_file: requirements = requirements_file.readlines() # Getting version: -with open('src/dependency_injector/__init__.py') as init_file: - version = re.search('__version__ = \'(.*?)\'', init_file.read()).group(1) +with open("src/dependency_injector/__init__.py") as init_file: + version = re.search("__version__ = \"(.*?)\"", init_file.read()).group(1) # Adding debug options: -if os.environ.get('DEPENDENCY_INJECTOR_DEBUG_MODE') == '1': - defined_macros['CYTHON_TRACE'] = 1 - defined_macros['CYTHON_TRACE_NOGIL'] = 1 - defined_macros['CYTHON_CLINE_IN_TRACEBACK'] = 1 +if os.environ.get("DEPENDENCY_INJECTOR_DEBUG_MODE") == "1": + defined_macros["CYTHON_TRACE"] = 1 + defined_macros["CYTHON_TRACE_NOGIL"] = 1 + defined_macros["CYTHON_CLINE_IN_TRACEBACK"] = 1 -setup(name='dependency-injector', +setup(name="dependency-injector", version=version, - description='Dependency injection framework for Python', + description="Dependency injection framework for Python", long_description=description, - author='Roman Mogylatov', - author_email='rmogilatov@gmail.com', - maintainer='Roman Mogylatov', - maintainer_email='rmogilatov@gmail.com', - url='https://github.com/ets-labs/python-dependency-injector', - download_url='https://pypi.python.org/pypi/dependency_injector', + author="Roman Mogylatov", + author_email="rmogilatov@gmail.com", + maintainer="Roman Mogylatov", + maintainer_email="rmogilatov@gmail.com", + url="https://github.com/ets-labs/python-dependency-injector", + download_url="https://pypi.python.org/pypi/dependency_injector", packages=[ - 'dependency_injector', - 'dependency_injector.ext', + "dependency_injector", + "dependency_injector.ext", ], package_dir={ - '': 'src', + "": "src", }, package_data={ - 'dependency_injector': ['*.pxd', '*.pyi', 'py.typed'], + "dependency_injector": ["*.pxd", "*.pyi", "py.typed"], }, ext_modules=[ - Extension('dependency_injector.containers', - ['src/dependency_injector/containers.c'], + Extension("dependency_injector.containers", + ["src/dependency_injector/containers.c"], define_macros=list(defined_macros.items()), - extra_compile_args=['-O2']), - Extension('dependency_injector.providers', - ['src/dependency_injector/providers.c'], + extra_compile_args=["-O2"]), + Extension("dependency_injector.providers", + ["src/dependency_injector/providers.c"], define_macros=list(defined_macros.items()), - extra_compile_args=['-O2']), + extra_compile_args=["-O2"]), ], install_requires=requirements, extras_require={ - 'yaml': [ - 'pyyaml', + "yaml": [ + "pyyaml", ], - 'pydantic': [ - 'pydantic', + "pydantic": [ + "pydantic", ], - 'flask': [ - 'flask', + "flask": [ + "flask", ], - 'aiohttp': [ - 'aiohttp', + "aiohttp": [ + "aiohttp", ], }, zip_safe=True, - license='BSD New', - platforms=['any'], + license="BSD New", + platforms=["any"], keywords=[ - 'Dependency injection', - 'DI', - 'Inversion of Control', - 'IoC', - 'Factory', - 'Singleton', - 'Design patterns', - 'Flask', + "Dependency injection", + "DI", + "Inversion of Control", + "IoC", + "Factory", + "Singleton", + "Design patterns", + "Flask", ], classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - '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 :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', - 'Framework :: AsyncIO', - 'Framework :: Bottle', - 'Framework :: Django', - 'Framework :: Flask', - 'Framework :: Pylons', - 'Framework :: Pyramid', - 'Framework :: Pytest', - 'Framework :: TurboGears', - 'Topic :: Software Development', - 'Topic :: Software Development :: Libraries', - 'Topic :: Software Development :: Libraries :: Python Modules', + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "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 :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Framework :: AsyncIO", + "Framework :: Bottle", + "Framework :: Django", + "Framework :: Flask", + "Framework :: Pylons", + "Framework :: Pyramid", + "Framework :: Pytest", + "Framework :: TurboGears", + "Topic :: Software Development", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Libraries :: Python Modules", ])