Skip to content

Commit b97862c

Browse files
authored
Python 3.10 (#520)
* Add GA test and linter jobs * Remove not used async run() functions from tests * Update aiohttp ext test * Add botocore warning ignores * Update changelog * Update publishing job config for testing * Publishing test #1 * Update GA tests-and-linters job to use latest ubuntu for tests * Update publishing GA job
1 parent 94aca21 commit b97862c

File tree

8 files changed

+31
-23
lines changed

8 files changed

+31
-23
lines changed

Diff for: .github/workflows/publishing.yml

+18-15
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ jobs:
99

1010
tests:
1111
name: Run tests
12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-20.04
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-python@v2
1616
with:
17-
python-version: 3.9
17+
python-version: "3.10"
1818
- run: pip install tox
1919
- run: tox
2020
env:
21-
TOXENV: 3.9
21+
TOXENV: "3.10"
2222

2323
linters:
2424
name: Run linters
25-
runs-on: ubuntu-18.04
25+
runs-on: ubuntu-20.04
2626
strategy:
2727
matrix:
2828
toxenv: [flake8, pydocstyle, mypy, pylint]
2929
steps:
3030
- uses: actions/checkout@v2
3131
- uses: actions/setup-python@v2
3232
with:
33-
python-version: 3.9
33+
python-version: "3.10"
3434
- run: pip install tox
3535
- run: tox
3636
env:
@@ -39,12 +39,12 @@ jobs:
3939
build-sdist:
4040
name: Build source tarball
4141
needs: [tests, linters]
42-
runs-on: ubuntu-18.04
42+
runs-on: ubuntu-20.04
4343
steps:
4444
- uses: actions/checkout@v2
4545
- uses: actions/setup-python@v2
4646
with:
47-
python-version: 3.9
47+
python-version: "3.10"
4848
- run: python setup.py sdist
4949
- uses: actions/upload-artifact@v2
5050
with:
@@ -56,15 +56,15 @@ jobs:
5656
runs-on: ${{ matrix.os }}
5757
strategy:
5858
matrix:
59-
os: [ubuntu-18.04, windows-latest, macos-latest]
59+
os: [ubuntu-20.04, windows-2019, macOS-10.15]
6060
env:
6161
CIBW_SKIP: cp27-win*
6262
steps:
6363
- uses: actions/checkout@v2
6464
- uses: actions/setup-python@v2
6565
with:
66-
python-version: 3.9
67-
- run: pip install cibuildwheel==1.8.0
66+
python-version: "3.10"
67+
- run: pip install cibuildwheel==2.1.3
6868
- run: cibuildwheel --output-dir wheelhouse
6969
- uses: actions/upload-artifact@v2
7070
with:
@@ -73,15 +73,15 @@ jobs:
7373
build-wheels-linux-aarch64:
7474
name: Build wheels (ubuntu-latest-aarch64)
7575
needs: [tests, linters]
76-
runs-on: ubuntu-18.04
76+
runs-on: ubuntu-20.04
7777
steps:
7878
- uses: actions/checkout@v2
7979
- name: Set up QEMU
8080
uses: docker/setup-qemu-action@v1
8181
- uses: actions/setup-python@v2
8282
with:
83-
python-version: 3.9
84-
- run: pip install cibuildwheel==1.8.0
83+
python-version: "3.10"
84+
- run: pip install cibuildwheel==2.1.3
8585
- run: cibuildwheel --archs aarch64 --output-dir wheelhouse
8686
- uses: actions/upload-artifact@v2
8787
with:
@@ -90,7 +90,7 @@ jobs:
9090
publish:
9191
name: Publish on PyPI
9292
needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
93-
runs-on: ubuntu-18.04
93+
runs-on: ubuntu-20.04
9494
steps:
9595
- uses: actions/download-artifact@v2
9696
with:
@@ -100,6 +100,9 @@ jobs:
100100
with:
101101
user: __token__
102102
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/
103106

104107
publish-docs:
105108
name: Publish docs
@@ -109,7 +112,7 @@ jobs:
109112
- uses: actions/checkout@v2
110113
- uses: actions/setup-python@v2
111114
with:
112-
python-version: 3.9
115+
python-version: "3.10"
113116
- run: pip install -r requirements-doc.txt
114117
- run: pip install awscli
115118
- run: pip install -e .

Diff for: .github/workflows/tests-and-linters.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66

77
test-on-different-versions:
88
name: Run tests
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
12+
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy2, pypy3]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-python@v2
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v2
3232
- uses: actions/setup-python@v2
3333
with:
34-
python-version: 3.9
34+
python-version: "3.10"
3535
- run: pip install tox cython
3636
- run: make cythonize
3737
- run: tox
@@ -48,7 +48,7 @@ jobs:
4848
- uses: actions/checkout@v2
4949
- uses: actions/setup-python@v2
5050
with:
51-
python-version: 3.9
51+
python-version: "3.10"
5252
- run: pip install tox
5353
- run: tox
5454
env:

Diff for: docs/main/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ follows `Semantic versioning`_
99

1010
Develop
1111
-------
12+
- Add support of Python 3.10.
1213
- Improve wiring with adding importing modules and packages from a string
1314
``container.wire(modules=["yourapp.module1"])``.
1415
- Add container wiring configuration ``wiring_config = containers.WiringConfiguration()``.

Diff for: setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
"Programming Language :: Python :: 3.7",
102102
"Programming Language :: Python :: 3.8",
103103
"Programming Language :: Python :: 3.9",
104+
"Programming Language :: Python :: 3.10",
104105
"Programming Language :: Python :: Implementation :: CPython",
105106
"Programming Language :: Python :: Implementation :: PyPy",
106107
"Framework :: AsyncIO",

Diff for: tests/.configs/pytest-py27.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[pytest]
2-
testpaths = tests/unit
2+
testpaths = tests/unit/
33
python_files = test_*_py2_py3.py
44
filterwarnings =
55
ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
66
ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
7+
ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*

Diff for: tests/.configs/pytest-py35.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[pytest]
2-
testpaths = tests/unit
2+
testpaths = tests/unit/
33
python_files = test_*_py3.py
44
filterwarnings =
55
ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
66
ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
7+
ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*

Diff for: tests/.configs/pytest.ini

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ python_files = test_*_py3*.py
44
filterwarnings =
55
ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
66
ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
7+
ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*

Diff for: tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist=
3-
coveralls, pylint, flake8, pydocstyle, 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3
3+
coveralls, pylint, flake8, pydocstyle, 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, pypy2, pypy3
44

55
[testenv]
66
deps=
@@ -24,7 +24,7 @@ python_files = test_*_py3*.py
2424

2525
[testenv:coveralls]
2626
passenv = GITHUB_* COVERALLS_*
27-
basepython=python3.9
27+
basepython=python3.10
2828
usedevelop=True
2929
deps=
3030
{[testenv]deps}

0 commit comments

Comments
 (0)