From c5dd1536a0f33c7b1eabf08079e16e5817ff0e1f Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 25 Dec 2019 07:58:59 +0900 Subject: Prepare non-primary Django tests in zuul jobs We already have a template 'horizon-non-primary-django-jobs' to test horizon and plugins with non-primary django versions, but we still need to update tox.ini in all horizon plugins whenever we change Django versions used. This commit prepares per-Django environment in the zuul job. Per-Django tox environments like py3-{dj111,dj20,dj22} are no longer needed. It would be a big merit that we will no longer need to update tox.ini in all horizon plugins. The downside is that we do not provide a convenient way to test it locally, but I think it can be covered in the document. Change-Id: I726b19130ee9e7d06eb33231071c2673cfd3a49f --- tox.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3b75983cb..bec62fa16 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.1 -envlist = pep8,py36,py37,py3-dj{111,21,22},releasenotes,npm +envlist = pep8,py36,py37,releasenotes,npm skipsdist = True # Automatic envs (pyXX) will only use the python version appropriate to that # env and ignore basepython inherited from [testenv] if we set @@ -24,9 +24,6 @@ deps = -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = - dj111: pip install django>=1.11,<2.0 - dj21: pip install django>=2.1,<2.2 - dj22: pip install django>=2.2,<2.3 find . -type f -name "*.pyc" -delete bash {toxinidir}/tools/unit_tests.sh {envpython} {toxinidir} {posargs} -- cgit v1.2.1