fix CI

Author: lobsterkatie

CHANGES.md

@@ -22,7 +22,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
 
 ## 0.19.3
 
-- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, GCP, Pyrammid, Tryton, RQ, and WSGI integrations
+- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, Flask, GCP, Pyramid, Tryton, RQ, and WSGI integrations
 - Fix a bug where the AWS integration would crash if event was anything besides a dictionary
 - Fix the Django integrations's ASGI handler for Channels 3.0. Thanks Luke Pomfrey!
 

tox.ini

@@ -28,7 +28,9 @@ envlist =
 
     {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
+
+    # TODO: see note in [testenv:flask-dev] below
+    ; {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
 
@@ -132,7 +134,10 @@ deps =
     flask-0.12: Flask>=0.12,<0.13
     flask-1.0: Flask>=1.0,<1.1
     flask-1.1: Flask>=1.1,<1.2
-    flask-dev: git+https://github.com/pallets/flask.git#egg=flask
+
+    # TODO: see note in [testenv:flask-dev] below
+    ; flask-dev: git+https://github.com/pallets/flask.git#egg=flask
+    ; flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
 
     bottle-0.12: bottle>=0.12,<0.13
     bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
@@ -293,6 +298,40 @@ basepython =
 commands =
     py.test {env:TESTPATH} {posargs}
 
+
+# TODO: This is broken out as a separate env so as to be able to override the
+# werkzeug version. (You can't do it just by letting one version be specifed in
+# a requirements file and specifying a different version in one testenv, see
+# https://github.com/tox-dev/tox/issues/1390.) The issue is that as of 11/11/20,
+# flask-dev has made a change which werkzeug then had to compensate for in
+# https://github.com/pallets/werkzeug/pull/1960. Since we've got werkzeug
+# pinned at 0.15.5 in test-requirements.txt, we don't get this fix.
+
+# At some point, we probably want to revisit this, since the list copied from
+# test-requirements.txt could easily get stale.
+[testenv:flask-dev]
+deps =
+    git+https://github.com/pallets/flask.git#egg=flask
+    git+https://github.com/pallets/werkzeug.git#egg=werkzeug
+
+    # everything below this point is from test-requirements.txt (minus, of
+    # course, werkzeug)
+    pytest==3.7.3
+    pytest-forked==1.1.3
+    tox==3.7.0
+    pytest-localserver==0.5.0
+    pytest-cov==2.8.1
+    jsonschema==3.2.0
+    pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
+    mock # for testing under python < 3.3
+
+    gevent
+    eventlet
+
+    newrelic
+    executing
+    asttokens
+
 [testenv:linters]
 commands =
     flake8 tests examples sentry_sdk