From 29efdf74aa2e6a5bfb506e46d5dcefa0e6939473 Mon Sep 17 00:00:00 2001 From: Dylan Young Date: Mon, 23 May 2022 20:08:51 -0300 Subject: [PATCH] TODO: upgrade test deps --- setup.cfg | 2 +- setup.py | 8 ++++---- tox.ini | 11 ++++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index bb9a8f1..1c620a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ [tool:pytest] -addopts = -vs --tb=short --pep8 --flakes --ignore docs/conf.py +addopts = -vs --tb=short --pycodestyle --flakes --ignore docs/conf.py DJANGO_SETTINGS_MODULE = csp.tests.settings diff --git a/setup.py b/setup.py index 26d0c30..858eb89 100644 --- a/setup.py +++ b/setup.py @@ -31,12 +31,12 @@ def read(*parts): ] test_requires = [ - 'pytest<4.0', + 'pytest<8.0', 'pytest-cov', 'pytest-django', - 'pytest-flakes==1.0.1', - 'pytest-pep8==1.0.6', - 'pep8==1.4.6', + 'pytest-flakes==4.0.5', + 'pytest-pycodestyle==2.2.1', + 'pycodestyle==2.8.0', 'mock==1.0.1', ] diff --git a/tox.ini b/tox.ini index 65c4dbd..b9894aa 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,10 @@ [tox] envlist = - {3.6,3.7,3.8,3.9,pypy3}-main - {3.6,3.7,3.8,3.9,pypy3}-3.0.x - {3.6,3,7,3.8,3.9,pypy3}-2.2.x + # {pypy3.9}-4.1.x + {3.8,3.9,pypy3.9}-main + {3.8,3.9,pypy3.9}-4.0.x + {3.6,3.7,3.8,3.9,pypy3}-3.2.x + {3.6,3.7,3.8,3.9,pypy3}-2.2.x [testenv] setenv = @@ -18,8 +20,11 @@ basepython = 3.8: python3.8 3.9: python3.9 pypy3: pypy3 + pypy3.9: pypy3.9 deps= pytest 2.2.x: Django>=2.2,<2.3 3.2.x: Django>=3.2,<3.3 + 4.0.x: Django>=4.0,<4.1 main: https://github.com/django/django/archive/main.tar.gz + 4.1.x: https://github.com/django/django/archive/1d071ec1aa8fa414bb96b41f7be8a1bd01079815.tar.gz