entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

update dependances, accepting django 1.11 (#19890)

This commit is contained in:
Thomas NOËL 2017-10-25 23:42:26 +02:00
parent 707544aa35
commit 2b66bc8862
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -1,4 +1,4 @@
django >= 1.8, <1.9 django >= 1.8, <1.12
django-jsonresponse >= 0.10, < 0.11 django-jsonresponse >= 0.10, < 0.11
django-model-utils django-model-utils
django-jsonfield >= 0.9.3 django-jsonfield >= 0.9.3

2
setup.py
View File

@ -85,7 +85,7 @@ setup(name='passerelle',
scripts=['manage.py'], scripts=['manage.py'],
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'django >= 1.8, <1.9', 'django >= 1.8, <1.12',
'django-model-utils', 'django-model-utils',
'django-jsonfield', 'django-jsonfield',
'requests', 'requests',

3
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = coverage-django18-pylint envlist = coverage-{django18,django111}-pylint
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/ toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/
[testenv] [testenv]
@ -12,6 +12,7 @@ setenv =
coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=passerelle/ --cov-config .coveragerc coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=passerelle/ --cov-config .coveragerc
deps = deps =
django18: django>=1.8,<1.9 django18: django>=1.8,<1.9
django111: django>=1.11,<1.12
pytest-cov pytest-cov
pytest-django pytest-django
pytest pytest