misc: require django 1.11 (#33238)
This commit is contained in:
parent
f035e6a2cf
commit
f0d10f92a9
|
@ -14,25 +14,15 @@ pipeline {
|
||||||
utils = new Utils()
|
utils = new Utils()
|
||||||
utils.publish_coverage('coverage-*.xml')
|
utils.publish_coverage('coverage-*.xml')
|
||||||
utils.publish_coverage_native(
|
utils.publish_coverage_native(
|
||||||
'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage authentic tests')
|
'index.html', 'htmlcov-coverage-authentic', 'Coverage authentic tests')
|
||||||
utils.publish_coverage_native(
|
utils.publish_coverage_native(
|
||||||
'index.html', 'htmlcov-coverage-django18-hobo', 'Coverage hobo tests')
|
'index.html', 'htmlcov-coverage-hobo', 'Coverage hobo tests')
|
||||||
utils.publish_coverage_native(
|
utils.publish_coverage_native(
|
||||||
'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage multipublik tests')
|
'index.html', 'htmlcov-coverage-multipublik', 'Coverage multipublik tests')
|
||||||
utils.publish_coverage_native(
|
utils.publish_coverage_native(
|
||||||
'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage multitenant tests')
|
'index.html', 'htmlcov-coverage-multitenant', 'Coverage multitenant tests')
|
||||||
utils.publish_coverage_native(
|
utils.publish_coverage_native(
|
||||||
'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage passerelle tests')
|
'index.html', 'htmlcov-coverage-passerelle', 'Coverage passerelle tests')
|
||||||
utils.publish_coverage_native(
|
|
||||||
'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage authentic tests')
|
|
||||||
utils.publish_coverage_native(
|
|
||||||
'index.html', 'htmlcov-coverage-django111-hobo', 'Coverage hobo tests')
|
|
||||||
utils.publish_coverage_native(
|
|
||||||
'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage multipublik tests')
|
|
||||||
utils.publish_coverage_native(
|
|
||||||
'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage multitenant tests')
|
|
||||||
utils.publish_coverage_native(
|
|
||||||
'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage passerelle tests')
|
|
||||||
utils.publish_pylint('pylint.out')
|
utils.publish_pylint('pylint.out')
|
||||||
}
|
}
|
||||||
junit 'junit-*.xml'
|
junit 'junit-*.xml'
|
||||||
|
@ -43,7 +33,7 @@ pipeline {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
if (env.JOB_NAME == 'hobo' && env.GIT_BRANCH == 'origin/master') {
|
if (env.JOB_NAME == 'hobo' && env.GIT_BRANCH == 'origin/master') {
|
||||||
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder hobo'
|
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch hobo'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ Package: python-hobo
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends},
|
Depends: ${misc:Depends},
|
||||||
${python:Depends},
|
${python:Depends},
|
||||||
|
python-django (>= 1:1.11),
|
||||||
python-celery (>= 3.1.13),
|
python-celery (>= 3.1.13),
|
||||||
python-requests,
|
python-requests,
|
||||||
python-raven,
|
python-raven,
|
||||||
|
@ -19,7 +20,7 @@ Depends: ${misc:Depends},
|
||||||
python-prometheus-client,
|
python-prometheus-client,
|
||||||
python-djangorestframework,
|
python-djangorestframework,
|
||||||
python-dnspython
|
python-dnspython
|
||||||
Recommends: python-django (>= 1.8),
|
Recommends:
|
||||||
python-gadjo,
|
python-gadjo,
|
||||||
python-django-mellon (>= 1.2.22.26),
|
python-django-mellon (>= 1.2.22.26),
|
||||||
memcached,
|
memcached,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
django>=1.8,<1.9
|
django>=1.11,<1.12
|
||||||
-e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo
|
-e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo
|
||||||
celery<4
|
celery<4
|
||||||
django-mellon
|
django-mellon
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -104,7 +104,7 @@ setup(
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
'Programming Language :: Python :: 2',
|
'Programming Language :: Python :: 2',
|
||||||
],
|
],
|
||||||
install_requires=['django>=1.8, <1.12',
|
install_requires=['django>=1.11, <1.12',
|
||||||
'gadjo',
|
'gadjo',
|
||||||
'celery<4',
|
'celery<4',
|
||||||
'django-mellon',
|
'django-mellon',
|
||||||
|
|
8
tox.ini
8
tox.ini
|
@ -4,7 +4,7 @@
|
||||||
# and then run "tox" from this directory.
|
# and then run "tox" from this directory.
|
||||||
[tox]
|
[tox]
|
||||||
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo
|
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo
|
||||||
envlist = coverage-{django18,django111}-{authentic,hobo,multipublik,multitenant,passerelle,schemas},
|
envlist = coverage-{authentic,hobo,multipublik,multitenant,passerelle,schemas},
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python2
|
basepython = python2
|
||||||
|
@ -30,8 +30,6 @@ setenv =
|
||||||
coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=hobo/ --cov-config .coveragerc
|
coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=hobo/ --cov-config .coveragerc
|
||||||
fast: NOMIGRATIONS=--nomigrations
|
fast: NOMIGRATIONS=--nomigrations
|
||||||
deps:
|
deps:
|
||||||
django18: django>=1.8,<1.9
|
|
||||||
django111: django>=1.11,<1.12
|
|
||||||
pytest<4.1
|
pytest<4.1
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-django
|
pytest-django
|
||||||
|
@ -44,9 +42,7 @@ deps:
|
||||||
django-webtest<1.9.3
|
django-webtest<1.9.3
|
||||||
celery<4
|
celery<4
|
||||||
Markdown<3
|
Markdown<3
|
||||||
django18: django-tables2<1.1
|
django-tables2<2.0
|
||||||
django111: django-tables2<2.0
|
|
||||||
django18: django-jsonfield<1.1
|
|
||||||
authentic: http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
|
authentic: http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
|
||||||
passerelle: http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
passerelle: http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
|
||||||
passerelle: suds
|
passerelle: suds
|
||||||
|
|
Loading…
Reference in New Issue