Update tox for Django dev branch install

Django has renamed their dev branch to "main".

(Also clean up some version reporting.)
This commit is contained in:
Mike Edmunds
2021-03-10 09:57:13 -08:00
committed by GitHub
parent f4c99abddf
commit a08052e7f8

11
tox.ini
View File

@@ -28,7 +28,7 @@ deps =
django30: django~=3.0.0 django30: django~=3.0.0
django31: django~=3.1.0 django31: django~=3.1.0
django32: django>=3.2a1 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 old_urllib3: urllib3<1.25
# testing dependencies (duplicates setup.py tests_require, less optional extras): # testing dependencies (duplicates setup.py tests_require, less optional extras):
mock mock
@@ -44,6 +44,7 @@ ignore_outcome =
args_are_paths = false args_are_paths = false
commands_pre = commands_pre =
python -VV python -VV
python -c 'import django; print("Django", django.__version__)'
commands = commands =
python runtests.py {posargs} python runtests.py {posargs}
passenv = passenv =
@@ -61,9 +62,10 @@ passenv =
# (but not any of the live test API keys) # (but not any of the live test API keys)
deps = deps =
flake8 flake8
commands = commands_pre =
python --version python -VV
flake8 --version flake8 --version
commands =
flake8 flake8
[testenv:docs] [testenv:docs]
@@ -77,6 +79,9 @@ setenv =
whitelist_externals = /bin/bash whitelist_externals = /bin/bash
deps = deps =
-rdocs/requirements.txt -rdocs/requirements.txt
commands_pre =
python -VV
sphinx-build --version
commands = commands =
# Verify README.rst as used in setup.py long_description: # Verify README.rst as used in setup.py long_description:
python setup.py check --restructuredtext --strict python setup.py check --restructuredtext --strict