Merge b02b8e5 into 94aca21

ets-labs · Oct 18, 2021 · 0e71582 · 0e71582
2 parents 94aca21 + b02b8e5
commit 0e71582
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/tests-and-linters.yml b/.github/workflows/tests-and-linters.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy2, pypy3]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox cython
       - run: make cythonize
       - run: tox
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox
       - run: tox
         env:

diff --git a/setup.py b/setup.py
@@ -101,6 +101,7 @@
           "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",
           "Programming Language :: Python :: 3.9",
+          "Programming Language :: Python :: 3.10",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Framework :: AsyncIO",

diff --git a/tests/.configs/pytest-py27.ini b/tests/.configs/pytest-py27.ini
@@ -1,6 +1,7 @@
 [pytest]
-testpaths = tests/unit
+testpaths = tests/unit/
 python_files = test_*_py2_py3.py
 filterwarnings =
     ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
     ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
+    ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*
diff --git a/tests/.configs/pytest-py35.ini b/tests/.configs/pytest-py35.ini
@@ -1,6 +1,7 @@
 [pytest]
-testpaths = tests/unit
+testpaths = tests/unit/
 python_files = test_*_py3.py
 filterwarnings =
     ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
     ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
+    ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*
diff --git a/tests/.configs/pytest.ini b/tests/.configs/pytest.ini
@@ -4,3 +4,4 @@ python_files = test_*_py3*.py
 filterwarnings =
     ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
     ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
+    ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    coveralls, pylint, flake8, pydocstyle, 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3
+    coveralls, pylint, flake8, pydocstyle, 2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, pypy2, pypy3
 
 [testenv]
 deps=
@@ -24,7 +24,7 @@ python_files = test_*_py3*.py
 
 [testenv:coveralls]
 passenv = GITHUB_* COVERALLS_*
-basepython=python3.9
+basepython=python3.10
 usedevelop=True
 deps=
     {[testenv]deps}