From 40fc1feb1893cda1679de0dcfec016e3417f48e8 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 15 Sep 2020 18:45:06 +0200 Subject: [PATCH 1/3] chore: Clean up Flask CI and test 0.10 --- sentry_sdk/integrations/flask.py | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py index 49611787f0..5c5a34fe55 100644 --- a/sentry_sdk/integrations/flask.py +++ b/sentry_sdk/integrations/flask.py @@ -69,7 +69,7 @@ def setup_once(): except (ValueError, TypeError): raise DidNotEnable("Unparsable Flask version: {}".format(FLASK_VERSION)) - if version < (0, 11): + if version < (0, 10): raise DidNotEnable("Flask 0.11 or newer is required.") request_started.connect(_request_started) diff --git a/tox.ini b/tox.ini index e841b3c9a6..547e58aa66 100644 --- a/tox.ini +++ b/tox.ini @@ -25,8 +25,7 @@ envlist = {py3.5,py3.6,py3.7}-django-{2.0,2.1} {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,dev} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{1.1,1.0,0.11,0.12} - {py3.6,py3.7,py3.8,py3.9}-flask-{1.1,1.0,0.11,0.12,dev} + {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0,1.1,dev} {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12 @@ -104,6 +103,7 @@ deps = django-dev: git+https://github.com/django/django.git#egg=Django flask: flask-login + flask-0.10: Flask>=0.10,<0.11 flask-0.11: Flask>=0.11,<0.12 flask-0.12: Flask>=0.12,<0.13 flask-1.0: Flask>=1.0,<1.1 From 77e269322fd2660dbcb94c4a56a7f5bb8495a4ff Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 15 Sep 2020 19:35:26 +0200 Subject: [PATCH 2/3] remove broken jobs --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 547e58aa66..c76954c61c 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,9 @@ envlist = {py3.5,py3.6,py3.7}-django-{2.0,2.1} {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,dev} - {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0,1.1,dev} + {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1 + {py3.6,py3.7,py3.8,py3.9}-flask-dev {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12 From 20712bfe804907644b2e2cee58a54c4e2b4911b2 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 15 Sep 2020 19:39:57 +0200 Subject: [PATCH 3/3] fix version number in error message --- sentry_sdk/integrations/flask.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py index 5c5a34fe55..86fcd76a16 100644 --- a/sentry_sdk/integrations/flask.py +++ b/sentry_sdk/integrations/flask.py @@ -70,7 +70,7 @@ def setup_once(): raise DidNotEnable("Unparsable Flask version: {}".format(FLASK_VERSION)) if version < (0, 10): - raise DidNotEnable("Flask 0.11 or newer is required.") + raise DidNotEnable("Flask 0.10 or newer is required.") request_started.connect(_request_started) got_request_exception.connect(_capture_exception)