From a08052e7f808c800cb336df3725b63865dc36afc Mon Sep 17 00:00:00 2001 From: Mike Edmunds Date: Wed, 10 Mar 2021 09:57:13 -0800 Subject: [PATCH] Update tox for Django dev branch install Django has renamed their dev branch to "main". (Also clean up some version reporting.) --- tox.ini | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index a316e49..8b33848 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ deps = django30: django~=3.0.0 django31: django~=3.1.0 django32: django>=3.2a1 - djangoDev: https://github.com/django/django/tarball/master + djangoDev: https://github.com/django/django/tarball/main old_urllib3: urllib3<1.25 # testing dependencies (duplicates setup.py tests_require, less optional extras): mock @@ -44,6 +44,7 @@ ignore_outcome = args_are_paths = false commands_pre = python -VV + python -c 'import django; print("Django", django.__version__)' commands = python runtests.py {posargs} passenv = @@ -61,9 +62,10 @@ passenv = # (but not any of the live test API keys) deps = flake8 -commands = - python --version +commands_pre = + python -VV flake8 --version +commands = flake8 [testenv:docs] @@ -77,6 +79,9 @@ setenv = whitelist_externals = /bin/bash deps = -rdocs/requirements.txt +commands_pre = + python -VV + sphinx-build --version commands = # Verify README.rst as used in setup.py long_description: python setup.py check --restructuredtext --strict