From aacf4ff6db03e2d14ea49418f4c60ef24297da57 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 6 Apr 2019 14:09:16 +0200 Subject: [PATCH 1/7] feat: Add more version of frameworks --- tox.ini | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/tox.ini b/tox.ini index 6c7089dd80..251427ce5e 100644 --- a/tox.ini +++ b/tox.ini @@ -5,43 +5,48 @@ [tox] envlist = - # core + # === Core === py{2.7,3.4,3.5,3.6,3.7,3.8} pypy - # integrations - {py3.7,py3.8}-django-dev - {py3.5,py3.6,py3.7}-django-{2.0,2.1} + + # === Integrations === + # Formatting: 1 blank line between different integrations. + + {py3.5,py3.6,py3.7}-django-{2.0,2.1,2.2,dev} {pypy,py2.7,py3.5}-django-1.11 {pypy,py2.7,py3.4,py3.5}-django-{1.8,1.9,1.10} {pypy,py2.7,py3.4}-django-1.7 {pypy,py2.7}-django-1.6 {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.0,0.11,0.12,dev} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-0.12 + + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-{0.12,0.13} {py3.5,py3.6,py3.7}-sanic-{0.8,18,19} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3} {pypy,py2.7}-celery-3 - {py2.7,py3.7}-requests - + # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions. py3.7-aws_lambda - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10} {pypy,py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13,1.0} + + py3.7-aiohttp-{3.5,3.6} - py3.7-aiohttp {py3.7,py3.8}-tornado-{5,6} + {py2.7,py3.7}-requests + [testenv] deps = -r test-requirements.txt - django-{1.11,2.0,2.1}: djangorestframework>=3.0.0,<4.0.0 + django-{1.11,2.0,2.1,2.2}: djangorestframework>=3.0.0,<4.0.0 django-{1.6,1.7,1.8}: pytest-django<3.0 django-{1.9,1.10,1.11,2.0,2.1,dev}: pytest-django>=3.0 @@ -52,7 +57,8 @@ deps = django-1.10: Django>=1.10,<1.11 django-1.11: Django>=1.11,<1.12 django-2.0: Django>=2.0,<2.1 - django-2.1: Django>=2.0,<2.1 + django-2.1: Django>=2.1,<2.2 + django-2.2: Django>=2.2,<2.3 django-dev: git+https://github.com/django/django.git#egg=Django flask: flask-login @@ -62,6 +68,7 @@ deps = flask-dev: git+https://github.com/pallets/flask.git#egg=flask bottle-0.12: bottle>=0.12,<0.13 + bottle-0.13: bottle>=0.13,<0.14 sanic-0.8: sanic>=0.8,<0.9 sanic-18: sanic>=18.0,<19.0 @@ -72,6 +79,7 @@ deps = celery-3: Celery>=3.1,<4.0 celery-4.1: Celery>=4.1,<4.2 celery-4.2: Celery>=4.2,<4.3 + celery-4.3: Celery>=4.3,<4.4 requests: requests>=2.0 @@ -84,9 +92,10 @@ deps = pyramid-1.7: pyramid>=1.7,<1.8 pyramid-1.8: pyramid>=1.8,<1.9 pyramid-1.9: pyramid>=1.9,<1.10 + pyramid-1.10: pyramid>=1.10,<1.11 rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0 - rq-0.13: fakeredis>=1.0 + rq-{0.13,1.0}: fakeredis>=1.0 # fakeredis 1.0 is broken with redis 3.2 rq: redis<3.2.0 @@ -98,8 +107,10 @@ deps = rq-0.11: rq>=0.11,<0.12 rq-0.12: rq>=0.12,<0.13 rq-0.13: rq>=0.13,<0.14 + rq-1.0: rq>=1.0,<1.1 - aiohttp: aiohttp>=3.4.0,<3.5.0 + aiohttp-3.4: aiohttp>=3.4.0,<3.5.0 + aiohttp-3.5: aiohttp>=3.5.0,<3.6.0 aiohttp: pytest-aiohttp tornado-5: tornado>=5,<6 From 565c8f0800f47077b01c8780b846baf03b9dddee Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 6 Apr 2019 14:54:02 +0200 Subject: [PATCH 2/7] fix: Bottle 0.13 is not released yet --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 251427ce5e..58d62e2d49 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ envlist = {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.0,0.11,0.12,dev} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-{0.12,0.13} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-{0.12,dev} {py3.5,py3.6,py3.7}-sanic-{0.8,18,19} @@ -68,7 +68,7 @@ deps = flask-dev: git+https://github.com/pallets/flask.git#egg=flask bottle-0.12: bottle>=0.12,<0.13 - bottle-0.13: bottle>=0.13,<0.14 + bottle-dev: git+https://https://github.com/bottlepy/bottle#egg=bottle sanic-0.8: sanic>=0.8,<0.9 sanic-18: sanic>=18.0,<19.0 From 448078e4787b6aac29fae7a2b5d01e11182fe50f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 6 Apr 2019 15:54:35 +0200 Subject: [PATCH 3/7] fix: Fix schema --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 58d62e2d49..8dbef4c975 100644 --- a/tox.ini +++ b/tox.ini @@ -68,7 +68,7 @@ deps = flask-dev: git+https://github.com/pallets/flask.git#egg=flask bottle-0.12: bottle>=0.12,<0.13 - bottle-dev: git+https://https://github.com/bottlepy/bottle#egg=bottle + bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle sanic-0.8: sanic>=0.8,<0.9 sanic-18: sanic>=18.0,<19.0 From 3606a8c2332b13d53ad538f6ca431d172f3eb24f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 7 Apr 2019 21:33:07 +0200 Subject: [PATCH 4/7] fix: Fix Django tests --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8dbef4c975..68a7a8f6ed 100644 --- a/tox.ini +++ b/tox.ini @@ -49,7 +49,7 @@ deps = django-{1.11,2.0,2.1,2.2}: djangorestframework>=3.0.0,<4.0.0 django-{1.6,1.7,1.8}: pytest-django<3.0 - django-{1.9,1.10,1.11,2.0,2.1,dev}: pytest-django>=3.0 + django-{1.9,1.10,1.11,2.0,2.1,2.2,dev}: pytest-django>=3.0 django-1.6: Django>=1.6,<1.7 django-1.7: Django>=1.7,<1.8 django-1.8: Django>=1.8,<1.9 From ba2acece787b05b427319f7be6e8e9c9cab0822b Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 7 Apr 2019 21:38:34 +0200 Subject: [PATCH 5/7] fix: Skip broken celery test in 4.3 --- tests/integrations/celery/test_celery.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py index f9cc92a51b..dc5e1f3e91 100644 --- a/tests/integrations/celery/test_celery.py +++ b/tests/integrations/celery/test_celery.py @@ -111,8 +111,9 @@ def dummy_task(x, y): assert stack_lengths == [2, 2] -@pytest.mark.skipif( - (4, 2, 0) <= VERSION < (4, 2, 3), +@pytest.mark.xfail( + (4, 2, 0) <= VERSION, + strict=True, reason="https://github.com/celery/celery/issues/4661", ) def test_retry(celery, capture_events): From db6d251f4bbed3aa817bc2d6055c0b68305fed78 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 7 Apr 2019 21:46:29 +0200 Subject: [PATCH 6/7] fix: Remove dev version of Bottle --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 68a7a8f6ed..0cfb4c1f0a 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ envlist = {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.0,0.11,0.12,dev} - {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-{0.12,dev} + {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-0.12 {py3.5,py3.6,py3.7}-sanic-{0.8,18,19} From efb6c7106c44b72c331cc3fd5560795088617831 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 7 Apr 2019 22:56:02 +0200 Subject: [PATCH 7/7] fix: Do not test Django 2.2+ with Python 3.6- Django 2.2 still supports 3.5 but it doesn't seem to work in Travis due to an outdated sqlite version. Django dev requires 3.6+ but doesn't actually work with 3.6 in Travis for the same reason. --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0cfb4c1f0a..916ff6ecb1 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,8 @@ envlist = # === Integrations === # Formatting: 1 blank line between different integrations. - {py3.5,py3.6,py3.7}-django-{2.0,2.1,2.2,dev} + py3.7-django-{2.2,dev} + {py3.5,py3.6,py3.7}-django-{2.0,2.1} {pypy,py2.7,py3.5}-django-1.11 {pypy,py2.7,py3.4,py3.5}-django-{1.8,1.9,1.10} {pypy,py2.7,py3.4}-django-1.7