Skip to content

Commit cc2304e

Browse files
rmk135rmk135
committed
Merge branch 'release/4.41.0' into master
2 parents 3858cef + 4bfdf89 commit cc2304e

File tree

24 files changed

+344
-122
lines changed

24 files changed

+344
-122
lines changed

‎.github/workflows/publishing.yml

+40-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Publishing
22

33
on:
4+
workflow_dispatch:
45
push:
56
tags:
67
- '*'
@@ -9,28 +10,28 @@ jobs:
910

1011
tests:
1112
name: Run tests
12-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1314
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
15+
- uses: actions/checkout@v3
16+
- uses: actions/setup-python@v4
1617
with:
17-
python-version: "3.10"
18+
python-version: 3.11
1819
- run: pip install tox
1920
- run: tox
2021
env:
21-
TOXENV: "3.10"
22+
TOXENV: 3.11
2223

2324
linters:
2425
name: Run linters
25-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2627
strategy:
2728
matrix:
2829
toxenv: [flake8, pydocstyle, mypy, pylint]
2930
steps:
30-
- uses: actions/checkout@v2
31-
- uses: actions/setup-python@v2
31+
- uses: actions/checkout@v3
32+
- uses: actions/setup-python@v4
3233
with:
33-
python-version: "3.10"
34+
python-version: 3.11
3435
- run: pip install tox
3536
- run: tox
3637
env:
@@ -39,14 +40,14 @@ jobs:
3940
build-sdist:
4041
name: Build source tarball
4142
needs: [tests, linters]
42-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4344
steps:
44-
- uses: actions/checkout@v2
45-
- uses: actions/setup-python@v2
45+
- uses: actions/checkout@v3
46+
- uses: actions/setup-python@v4
4647
with:
47-
python-version: "3.10"
48+
python-version: 3.11
4849
- run: python setup.py sdist
49-
- uses: actions/upload-artifact@v2
50+
- uses: actions/upload-artifact@v3
5051
with:
5152
path: ./dist/*
5253

@@ -56,63 +57,60 @@ jobs:
5657
runs-on: ${{ matrix.os }}
5758
strategy:
5859
matrix:
59-
os: [ubuntu-20.04, windows-2019, macOS-10.15]
60+
os: [ubuntu-22.04, windows-2019, macos-11]
6061
env:
6162
CIBW_SKIP: cp27-win*
6263
steps:
63-
- uses: actions/checkout@v2
64-
- uses: actions/setup-python@v2
65-
with:
66-
python-version: "3.10"
67-
- run: pip install cibuildwheel==2.1.3
68-
- run: cibuildwheel --output-dir wheelhouse
69-
- uses: actions/upload-artifact@v2
64+
- uses: actions/checkout@v3
65+
- name: Build wheels
66+
uses: pypa/[email protected]
67+
- uses: actions/upload-artifact@v3
7068
with:
7169
path: ./wheelhouse/*.whl
7270

7371
build-wheels-linux-aarch64:
74-
name: Build wheels (ubuntu-latest-aarch64)
72+
name: Build wheels (ubuntu-22.04-aarch64)
7573
needs: [tests, linters]
76-
runs-on: ubuntu-20.04
74+
runs-on: ubuntu-22.04
7775
steps:
78-
- uses: actions/checkout@v2
76+
- uses: actions/checkout@v3
7977
- name: Set up QEMU
80-
uses: docker/setup-qemu-action@v1
81-
- uses: actions/setup-python@v2
82-
with:
83-
python-version: "3.10"
84-
- run: pip install cibuildwheel==2.1.3
85-
- run: cibuildwheel --archs aarch64 --output-dir wheelhouse
86-
- uses: actions/upload-artifact@v2
78+
if: runner.os == 'Linux'
79+
uses: docker/setup-qemu-action@v2
80+
- name: Build wheels
81+
uses: pypa/[email protected]
82+
env:
83+
CIBW_ARCHS_LINUX: aarch64
84+
- uses: actions/upload-artifact@v3
8785
with:
8886
path: ./wheelhouse/*.whl
8987

9088
publish:
9189
name: Publish on PyPI
9290
needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
93-
runs-on: ubuntu-20.04
91+
runs-on: ubuntu-22.04
9492
steps:
95-
- uses: actions/download-artifact@v2
93+
- uses: actions/download-artifact@v3
9694
with:
9795
name: artifact
9896
path: dist
99-
- uses: pypa/gh-action-pypi-publish@master
97+
- uses: pypa/gh-action-pypi-publish@release/v1
10098
with:
10199
user: __token__
102100
password: ${{ secrets.PYPI_API_TOKEN }}
103-
# For publishing to Test PyPI, uncomment next two lines:
104-
# password: ${{ secrets.TEST_PYPI_API_TOKEN }}
105-
# repository_url: https://test.pypi.org/legacy/
101+
# For publishing to Test PyPI, uncomment next two lines:
102+
# password: ${{ secrets.TEST_PYPI_API_TOKEN }}
103+
# repository_url: https://test.pypi.org/legacy/
106104

107105
publish-docs:
108106
name: Publish docs
109107
needs: [publish]
110-
runs-on: ubuntu-18.04
108+
runs-on: ubuntu-22.04
111109
steps:
112-
- uses: actions/checkout@v2
113-
- uses: actions/setup-python@v2
110+
- uses: actions/checkout@v3
111+
- uses: actions/setup-python@v4
114112
with:
115-
python-version: "3.10"
113+
python-version: 3.11
116114
- run: pip install -r requirements-doc.txt
117115
- run: pip install awscli
118116
- run: pip install -e .

‎.github/workflows/tests-and-linters.yml

+25-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,31 @@ on: [push, pull_request, workflow_dispatch]
44

55
jobs:
66

7+
tests-on-legacy-versions:
8+
name: Run tests on legacy versions
9+
runs-on: ubuntu-20.04
10+
strategy:
11+
matrix:
12+
python-version: [2.7, 3.5, 3.6, 3.7, pypy2.7, pypy3.9]
13+
steps:
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-python@v4
16+
with:
17+
python-version: ${{ matrix.python-version }}
18+
- run: pip install tox
19+
- run: tox
20+
env:
21+
TOXENV: ${{ matrix.python-version }}
22+
723
test-on-different-versions:
824
name: Run tests
925
runs-on: ubuntu-latest
1026
strategy:
1127
matrix:
12-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy2, pypy3]
28+
python-version: [3.8, 3.9, "3.10", 3.11]
1329
steps:
14-
- uses: actions/checkout@v2
15-
- uses: actions/setup-python@v2
30+
- uses: actions/checkout@v3
31+
- uses: actions/setup-python@v4
1632
with:
1733
python-version: ${{ matrix.python-version }}
1834
- run: pip install tox
@@ -28,10 +44,10 @@ jobs:
2844
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
2945
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3046
steps:
31-
- uses: actions/checkout@v2
32-
- uses: actions/setup-python@v2
47+
- uses: actions/checkout@v3
48+
- uses: actions/setup-python@v4
3349
with:
34-
python-version: "3.10"
50+
python-version: 3.11
3551
- run: pip install tox cython
3652
- run: make cythonize
3753
- run: tox
@@ -45,10 +61,10 @@ jobs:
4561
matrix:
4662
toxenv: [flake8, pydocstyle, mypy, pylint]
4763
steps:
48-
- uses: actions/checkout@v2
49-
- uses: actions/setup-python@v2
64+
- uses: actions/checkout@v3
65+
- uses: actions/setup-python@v4
5066
with:
51-
python-version: "3.10"
67+
python-version: 3.11
5268
- run: pip install tox
5369
- run: tox
5470
env:

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
:target: https://pypi.org/project/dependency-injector/
3636
:alt: Wheel
3737

38-
.. image:: https://img.shields.io/github/workflow/status/ets-labs/python-dependency-injector/Tests%20and%20linters/master
38+
.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
3939
:target: https://github.com/ets-labs/python-dependency-injector/actions
4040
:alt: Build Status
4141

‎docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Dependency Injector --- Dependency injection framework for Python
5050
:target: https://pypi.org/project/dependency-injector/
5151
:alt: Wheel
5252

53-
.. image:: https://img.shields.io/github/workflow/status/ets-labs/python-dependency-injector/Tests%20and%20linters/master
53+
.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
5454
:target: https://github.com/ets-labs/python-dependency-injector/actions
5555
:alt: Build Status
5656

‎docs/main/changelog.rst

+16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ that were made in every particular version.
77
From version 0.7.6 *Dependency Injector* framework strictly
88
follows `Semantic versioning`_
99

10+
4.41.0
11+
------
12+
- Add support of Python 3.11.
13+
- Allow Closing to detect dependent resources `#633 <https://github.com/ets-labs/python-dependency-injector/issues/633>`_,
14+
`#636 <https://github.com/ets-labs/python-dependency-injector/pull/636>`_. Thanks `Jamie Stumme @StummeJ <https://github.com/StummeJ>`_
15+
for the contribution.
16+
- Update CI/CD to use Ubuntu 22.04.
17+
- Update CI/CD to ``actions/checkout@v3``, ``actions/setup-python@v4``, ``actions/upload-artifact@v3``, ``pypa/[email protected]``,
18+
and ``actions/download-artifact@v3``.
19+
- Fix install crash on non-utf8 systems `#644 <https://github.com/ets-labs/python-dependency-injector/pull/644>`_.
20+
- Fix a bug in Windows build with default charset `#635 <https://github.com/ets-labs/python-dependency-injector/pull/635>`_.
21+
- Update FastAPI Redis example to use ``aioredis`` version 2 `#613 <https://github.com/ets-labs/python-dependency-injector/pull/613>`_.
22+
- Update documentation on creating custom providers `#598 <https://github.com/ets-labs/python-dependency-injector/pull/598>`_.
23+
- Regenerate C sources using Cython 0.29.32.
24+
- Fix builds badge.
25+
1026
4.40.0
1127
------
1228
- Add ``Configuration.from_json()`` method to load configuration from a json file.

‎docs/providers/custom.rst

+6-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ To create a custom provider you need to follow these rules:
1616
1. New provider class should inherit :py:class:`Provider`.
1717
2. You need to implement the ``Provider._provide()`` method.
1818
3. You need to implement the ``Provider.__deepcopy__()`` method. It should return an
19-
equivalent copy of a provider. All providers must be copied with a ``deepcopy()`` function
20-
from the ``providers`` module. After the a new provider object is created use
21-
``Provider._copy_overriding()`` method to copy all overriding providers. See the example
22-
below.
19+
equivalent copy of a provider. All providers must be copied with the ``deepcopy()`` function
20+
from the ``providers`` module. It's essential to pass ``memo`` into ``deepcopy`` in order to keep
21+
the preconfigured ``args`` and ``kwargs`` of stored providers. After the a new provider object
22+
is created, use ``Provider._copy_overriding()`` method to copy all overriding providers. See the
23+
example below.
2324
4. If new provider has a ``__init__()`` method, it should call the parent
2425
``Provider.__init__()``.
2526
5. If new provider stores any other providers, these providers should be listed in
@@ -33,7 +34,7 @@ To create a custom provider you need to follow these rules:
3334
.. note::
3435
1. Prefer delegation over inheritance. If you choose between inheriting a ``Factory`` or
3536
inheriting a ``Provider`` and use ``Factory`` internally - the last is better.
36-
2. When create a new provider follow the ``Factory``-like injections style. Consistency matters.
37+
2. When creating a new provider follow the ``Factory``-like injections style. Consistency matters.
3738
3. Use the ``__slots__`` attribute to make sure nothing could be attached to your provider. You
3839
will also save some memory.
3940

‎examples/miniapps/fastapi-redis/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-buster
1+
FROM python:3.10-buster
22

33
ENV PYTHONUNBUFFERED=1
44

‎examples/miniapps/fastapi-redis/README.rst

+24-33
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,26 @@ The output should be something like:
2424

2525
.. code-block::
2626
27-
redis_1 | 1:C 04 Jan 2022 02:42:14.115 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
28-
redis_1 | 1:C 04 Jan 2022 02:42:14.115 # Redis version=6.0.9, bits=64, commit=00000000, modified=0, pid=1, just started
29-
redis_1 | 1:C 04 Jan 2022 02:42:14.115 # Configuration loaded
30-
redis_1 | 1:M 04 Jan 2022 02:42:14.116 * Running mode=standalone, port=6379.
31-
redis_1 | 1:M 04 Jan 2022 02:42:14.116 # WARNING: The TCP backlog setting of 511 cannot be enforced because /proc/sys/net/core/somaxconn is set to the lower value of 128.
32-
redis_1 | 1:M 04 Jan 2022 02:42:14.116 # Server initialized
33-
redis_1 | 1:M 04 Jan 2022 02:42:14.117 * Loading RDB produced by version 6.0.9
34-
redis_1 | 1:M 04 Jan 2022 02:42:14.117 * RDB age 1 seconds
35-
redis_1 | 1:M 04 Jan 2022 02:42:14.117 * RDB memory usage when created 0.77 Mb
36-
redis_1 | 1:M 04 Jan 2022 02:42:14.117 * DB loaded from disk: 0.000 seconds
37-
redis_1 | 1:M 04 Jan 2022 02:42:14.117 * Ready to accept connections
38-
redis_1 | 1:signal-handler (1609728137) Received SIGTERM scheduling shutdown...
39-
redis_1 | 1:M 04 Jan 2022 02:42:17.984 # User requested shutdown...
40-
redis_1 | 1:M 04 Jan 2022 02:42:17.984 # Redis is now ready to exit, bye bye...
41-
redis_1 | 1:C 04 Jan 2022 02:42:22.035 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
42-
redis_1 | 1:C 04 Jan 2022 02:42:22.035 # Redis version=6.0.9, bits=64, commit=00000000, modified=0, pid=1, just started
43-
redis_1 | 1:C 04 Jan 2022 02:42:22.035 # Configuration loaded
44-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * Running mode=standalone, port=6379.
45-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 # WARNING: The TCP backlog setting of 511 cannot be enforced because /proc/sys/net/core/somaxconn is set to the lower value of 128.
46-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 # Server initialized
47-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * Loading RDB produced by version 6.0.9
48-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * RDB age 9 seconds
49-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * RDB memory usage when created 0.77 Mb
50-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * DB loaded from disk: 0.000 seconds
51-
redis_1 | 1:M 04 Jan 2022 02:42:22.037 * Ready to accept connections
52-
example_1 | INFO: Started server process [1]
53-
example_1 | INFO: Waiting for application startup.
54-
example_1 | INFO: Application startup complete.
55-
example_1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
27+
fastapi-redis-redis-1 | 1:C 19 Dec 2022 02:33:02.484 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
28+
fastapi-redis-redis-1 | 1:C 19 Dec 2022 02:33:02.484 # Redis version=7.0.5, bits=64, commit=00000000, modified=0, pid=1, just started
29+
fastapi-redis-redis-1 | 1:C 19 Dec 2022 02:33:02.484 # Configuration loaded
30+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.485 * monotonic clock: POSIX clock_gettime
31+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.485 * Running mode=standalone, port=6379.
32+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.485 # Server initialized
33+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.487 * Loading RDB produced by version 7.0.5
34+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.487 * RDB age 58 seconds
35+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.487 * RDB memory usage when created 0.85 Mb
36+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.487 * Done loading RDB, keys loaded: 0, keys expired: 0.
37+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.487 * DB loaded from disk: 0.000 seconds
38+
fastapi-redis-redis-1 | 1:M 19 Dec 2022 02:33:02.488 * Ready to accept connections
39+
fastapi-redis-example-1 | INFO: Started server process [1]
40+
fastapi-redis-example-1 | INFO: Waiting for application startup.
41+
fastapi-redis-example-1 | INFO: Application startup complete.
42+
fastapi-redis-example-1 | INFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)
43+
fastapi-redis-example-1 | INFO: 172.18.0.1:63998 - "GET / HTTP/1.1" 200 OK
44+
fastapi-redis-example-1 | INFO: 172.18.0.1:63998 - "GET /favicon.ico HTTP/1.1" 404 Not Found
45+
fastapi-redis-example-1 | INFO: 172.18.0.1:63998 - "GET / HTTP/1.1" 200 OK
46+
fastapi-redis-example-1 | INFO: 172.18.0.1:63998 - "GET / HTTP/1.1" 200 OK
5647
5748
Test
5849
----
@@ -69,9 +60,9 @@ The output should be something like:
6960

7061
.. code-block::
7162
72-
platform linux -- Python 3.9, pytest-6.2.1, py-1.10.0, pluggy-0.13.1
63+
platform linux -- Python 3.10.9, pytest-7.2.0, pluggy-1.0.0
7364
rootdir: /code
74-
plugins: cov-2.10.1, asyncio-0.14.0
65+
plugins: cov-4.0.0, asyncio-0.20.3
7566
collected 1 item
7667
7768
fastapiredis/tests.py . [100%]
@@ -80,10 +71,10 @@ The output should be something like:
8071
Name Stmts Miss Cover
8172
-------------------------------------------------
8273
fastapiredis/__init__.py 0 0 100%
83-
fastapiredis/application.py 15 0 100%
74+
fastapiredis/application.py 14 0 100%
8475
fastapiredis/containers.py 6 0 100%
8576
fastapiredis/redis.py 7 4 43%
8677
fastapiredis/services.py 7 3 57%
8778
fastapiredis/tests.py 18 0 100%
8879
-------------------------------------------------
89-
TOTAL 53 7 87%
80+
TOTAL 52 7 87%

‎examples/miniapps/fastapi-redis/fastapiredis/redis.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
"""Redis client module."""
2-
31
from typing import AsyncIterator
42

5-
from aioredis import create_redis_pool, Redis
3+
from aioredis import from_url, Redis
64

75

86
async def init_redis_pool(host: str, password: str) -> AsyncIterator[Redis]:
9-
pool = await create_redis_pool(f"redis://{host}", password=password)
10-
yield pool
11-
pool.close()
12-
await pool.wait_closed()
7+
session = from_url(f"redis://{host}", password=password, encoding="utf-8", decode_responses=True)
8+
yield session
9+
session.close()
10+
await session.wait_closed()

‎examples/miniapps/fastapi-redis/fastapiredis/services.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ def __init__(self, redis: Redis) -> None:
99

1010
async def process(self) -> str:
1111
await self._redis.set("my-key", "value")
12-
return await self._redis.get("my-key", encoding="utf-8")
12+
return await self._redis.get("my-key")

0 commit comments

Comments
 (0)