Skip to content

Commit 6a4c9ee

Browse files
authored
Merge pull request #376 from michael-k/python3.1x
Run tests against Python 3.10 and 3.11
2 parents 186beda + 7e95ff7 commit 6a4c9ee

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

.github/workflows/UnitTesting.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ jobs:
2121
py37: 3.7
2222
py38: 3.8
2323
py39: 3.9
24+
py310: '3.10'
25+
py311: '3.11'
2426
strategy:
2527
fail-fast: false
2628
matrix:
27-
python-version: [py27, py34, py35, py36, py37, py38, py39]
29+
python-version: [py27, py34, py35, py36, py37, py38, py39, py310, py311]
2830
testenv: [core, ext]
2931
steps:
3032
- name: Checkout repo

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
'Programming Language :: Python :: 3.7',
3838
'Programming Language :: Python :: 3.8',
3939
'Programming Language :: Python :: 3.9',
40+
'Programming Language :: Python :: 3.10',
41+
'Programming Language :: Python :: 3.11',
4042
],
4143

4244
install_requires=[

tox.ini

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
[tox]
22
skip_missing_interpreters = True
33
envlist =
4-
py{27,34,35,36,37,38,39}-core
4+
py{27,34,35,36,37,38,39,310,311}-core
55

66
; Unavailable for python 2.7 & 3.4
7-
py{35,36,37,38,39}-ext-aiobotocore
7+
py{35,36,37,38,39,310,311}-ext-aiobotocore
88

99
; Unavailable for python 2.7 & 3.4
10-
py{35,36,37,38,39}-ext-aiohttp
10+
py{35,36,37,38,39,310,311}-ext-aiohttp
1111

12-
py{27,34,35,36,37,38,39}-ext-botocore
12+
py{27,34,35,36,37,38,39,310,311}-ext-botocore
1313

14-
py{27,34,35,36,37,38,39}-ext-bottle
14+
py{27,34,35,36,37,38,39,310,311}-ext-bottle
1515

1616
; Django2 (2.2+) is only for python 3.5 +
1717
py{35,36,37,38,39}-ext-django-2
1818

1919
; Django3 is only for python 3.6+
20-
py{36,37,38,39}-ext-django-3
20+
py{36,37,38,39,310}-ext-django-3
2121

2222
; Django4 is only for python 3.8+
23-
py{38,39}-ext-django-4
23+
py{38,39,310,311}-ext-django-4
2424

25-
py{27,34,35,36,37,38,39}-ext-flask
25+
py{27,34,35,36,37,38,39,310,311}-ext-flask
2626

27-
py{27,34,35,36,37,38,39}-ext-flask_sqlalchemy
27+
py{27,34,35,36,37,38,39,310,311}-ext-flask_sqlalchemy
2828

29-
py{27,34,35,36,37,38,39}-ext-httplib
29+
py{27,34,35,36,37,38,39,310,311}-ext-httplib
3030

31-
py{37,38,39}-ext-httpx
31+
py{37,38,39,310,311}-ext-httpx
3232

33-
py{27,34,35,36,37,38,39}-ext-pg8000
33+
py{27,34,35,36,37,38,39,310,311}-ext-pg8000
3434

35-
py{27,34,35,36,37,38,39}-ext-psycopg2
35+
py{27,34,35,36,37,38,39,310,311}-ext-psycopg2
3636

37-
py{27,34,35,36,37,38,39}-ext-pymysql
37+
py{27,34,35,36,37,38,39,310,311}-ext-pymysql
3838

39-
py{27,34,35,36,37,38,39}-ext-pynamodb
39+
py{27,34,35,36,37,38,39,310,311}-ext-pynamodb
4040

41-
py{27,34,35,36,37,38,39}-ext-requests
41+
py{27,34,35,36,37,38,39,310,311}-ext-requests
4242

43-
py{27,34,35,36,37,38,39}-ext-sqlalchemy
43+
py{27,34,35,36,37,38,39,310,311}-ext-sqlalchemy
4444

45-
py{27,34,35,36,37,38,39}-ext-sqlalchemy_core
45+
py{27,34,35,36,37,38,39,310,311}-ext-sqlalchemy_core
4646

47-
py{27,34,35,36,37,38,39}-ext-sqlite3
47+
py{27,34,35,36,37,38,39,310,311}-ext-sqlite3
4848

4949
[testenv]
5050
passenv = TOXENV CI CODECOV_*
@@ -68,7 +68,7 @@ deps =
6868
py34: typing >= 3.7.4.3
6969

7070
; Python 3.5+ only deps
71-
py{35,36,37,38,39}: pytest-asyncio
71+
py{35,36,37,38,39,310,311}: pytest-asyncio
7272

7373
ext-aiobotocore: aiobotocore >= 0.10.0
7474
ext-aiobotocore: pytest-asyncio
@@ -102,7 +102,7 @@ deps =
102102

103103
py{27,34,35}-ext-pynamodb: pynamodb >=3.3.1,<4.4
104104
py{27,34,35}-ext-pynamodb: botocore <1.28
105-
py{36,37,38,39}-ext-pynamodb: pynamodb >=3.3.1
105+
py{36,37,38,39,310,311}-ext-pynamodb: pynamodb >=3.3.1
106106

107107
ext-psycopg2: psycopg2
108108
ext-psycopg2: testing.postgresql
@@ -112,7 +112,7 @@ deps =
112112

113113
ext-pymysql: testing.mysqld
114114
py{27,34,35}-ext-pymysql: pymysql < 1.0.0
115-
py{36,37,38,39}-ext-pymysql: pymysql >= 1.0.0
115+
py{36,37,38,39,310,311}-ext-pymysql: pymysql >= 1.0.0
116116

117117
setenv =
118118
DJANGO_SETTINGS_MODULE = tests.ext.django.app.settings
@@ -124,7 +124,7 @@ commands =
124124

125125
; Async methods are only available for python 3.5+
126126
py{27,34}-core: coverage run --append --source aws_xray_sdk -m pytest --ignore tests/ext --ignore tests/test_async_local_storage.py --ignore tests/test_async_recorder.py
127-
py{35,36,37,38,39}-core: coverage run --append --source aws_xray_sdk -m pytest --ignore tests/ext
127+
py{35,36,37,38,39,310,311}-core: coverage run --append --source aws_xray_sdk -m pytest --ignore tests/ext
128128

129129
ext-aiobotocore: coverage run --append --source aws_xray_sdk -m pytest tests/ext/aiobotocore
130130

@@ -157,7 +157,7 @@ commands =
157157
ext-sqlalchemy: coverage run --append --source aws_xray_sdk -m pytest tests/ext/sqlalchemy
158158

159159
; sqlalchemy_core - 2.0 style execution is not supported for python 3.4 & 3.5
160-
py{27,36,37,38,39}-ext-sqlalchemy_core: coverage run --append --source aws_xray_sdk -m pytest tests/ext/sqlalchemy_core
160+
py{27,36,37,38,39,310,311}-ext-sqlalchemy_core: coverage run --append --source aws_xray_sdk -m pytest tests/ext/sqlalchemy_core
161161
py{34,35}-ext-sqlalchemy_core: coverage run --append --source aws_xray_sdk -m pytest tests/ext/sqlalchemy_core --ignore tests/ext/sqlalchemy_core/test_sqlalchemy_core_2.py
162162

163163
ext-sqlite3: coverage run --append --source aws_xray_sdk -m pytest tests/ext/sqlite3

0 commit comments

Comments
 (0)