Skip to content

Commit a6e1fae

Browse files
authored
misc(test): Dont run tests on -dev branches and add latest versions of Django and Flask (#1196)
1 parent a780784 commit a6e1fae

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
2929
- No longer set the last event id for transactions #1186
3030
- Added support for client reports (disabled by default for now) #1181
3131
- Added `tracestate` header handling #1179
32+
- Added real ip detection to asgi integration #1199
3233

3334
## 1.3.1
3435

tox.ini

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ envlist =
2424
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
2525
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
2626
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
27-
{py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1}
28-
{py3.8,py3.9}-django-dev
27+
{py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,3.2}
2928

3029
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
3130
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
32-
33-
{py3.7,py3.8,py3.9}-flask-dev
31+
{py3.6,py3.8,py3.9}-flask-2.0
3432

3533
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
3634

@@ -48,7 +46,7 @@ envlist =
4846
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
4947
{py3.6,py3.7,py3.8}-celery-5.0
5048

51-
{py2.7,py3.7}-beam-{2.12,2.13}
49+
py3.7-beam-{2.12,2.13}
5250

5351
# The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
5452
py3.7-aws_lambda
@@ -94,20 +92,16 @@ deps =
9492
# with the -r flag
9593
-r test-requirements.txt
9694

97-
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
95+
django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
9896

99-
{py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: channels>2
100-
{py3.8,py3.9}-django-dev: channels>2
101-
{py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: pytest-asyncio
102-
{py3.8,py3.9}-django-dev: pytest-asyncio
103-
{py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1}: psycopg2-binary
104-
{py2.7,py3.8,py3.9}-django-dev: psycopg2-binary
97+
{py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels>2
98+
{py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
99+
{py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
105100

106101
django-{1.6,1.7}: pytest-django<3.0
107102
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
108-
django-{2.2,3.0,3.1}: pytest-django>=4.0
109-
django-{2.2,3.0,3.1}: Werkzeug<2.0
110-
django-dev: git+https://github.com/pytest-dev/pytest-django#egg=pytest-django
103+
django-{2.2,3.0,3.1,3.2}: pytest-django>=4.0
104+
django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0
111105

112106
django-1.6: Django>=1.6,<1.7
113107
django-1.7: Django>=1.7,<1.8
@@ -120,20 +114,16 @@ deps =
120114
django-2.2: Django>=2.2,<2.3
121115
django-3.0: Django>=3.0,<3.1
122116
django-3.1: Django>=3.1,<3.2
123-
django-dev: git+https://github.com/django/django.git#egg=Django
124117

125118
flask: flask-login
126119
flask-0.10: Flask>=0.10,<0.11
127120
flask-0.11: Flask>=0.11,<0.12
128121
flask-0.12: Flask>=0.12,<0.13
129122
flask-1.0: Flask>=1.0,<1.1
130123
flask-1.1: Flask>=1.1,<1.2
131-
132-
flask-dev: git+https://github.com/pallets/flask.git#egg=flask
133-
flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
124+
flask-2.0: Flask>=2.0,<2.1
134125

135126
bottle-0.12: bottle>=0.12,<0.13
136-
bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
137127

138128
falcon-1.4: falcon>=1.4,<1.5
139129
falcon-2.0: falcon>=2.0.0rc3,<3.0
@@ -148,7 +138,6 @@ deps =
148138
sanic: aiohttp
149139
py3.5-sanic: ujson<4
150140

151-
py2.7-beam: rsa<=4.0
152141
beam-2.12: apache-beam>=2.12.0, <2.13.0
153142
beam-2.13: apache-beam>=2.13.0, <2.14.0
154143
beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python

0 commit comments

Comments
 (0)