Projet

Général

Profil

0001-misc-require-django-1.11-33238.patch

Frédéric Péters, 19 mai 2019 15:59

Télécharger (5,2 ko)

Voir les différences:

Subject: [PATCH 1/2] misc: require django 1.11 (#33238)

 Jenkinsfile      | 20 +++++---------------
 debian/control   |  3 ++-
 requirements.txt |  2 +-
 setup.py         |  2 +-
 tox.ini          |  8 ++------
 5 files changed, 11 insertions(+), 24 deletions(-)
Jenkinsfile
14 14
                        utils = new Utils()
15 15
                        utils.publish_coverage('coverage-*.xml')
16 16
                        utils.publish_coverage_native(
17
                            'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage authentic tests')
17
                            'index.html', 'htmlcov-coverage-authentic', 'Coverage authentic tests')
18 18
                        utils.publish_coverage_native(
19
                            'index.html', 'htmlcov-coverage-django18-hobo', 'Coverage hobo tests')
19
                            'index.html', 'htmlcov-coverage-hobo', 'Coverage hobo tests')
20 20
                        utils.publish_coverage_native(
21
                            'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage multipublik tests')
21
                            'index.html', 'htmlcov-coverage-multipublik', 'Coverage multipublik tests')
22 22
                        utils.publish_coverage_native(
23
                            'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage multitenant tests')
23
                            'index.html', 'htmlcov-coverage-multitenant', 'Coverage multitenant tests')
24 24
                        utils.publish_coverage_native(
25
                            'index.html', 'htmlcov-coverage-django18-authentic', 'Coverage passerelle tests')
26
                        utils.publish_coverage_native(
27
                            'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage authentic tests')
28
                        utils.publish_coverage_native(
29
                            'index.html', 'htmlcov-coverage-django111-hobo', 'Coverage hobo tests')
30
                        utils.publish_coverage_native(
31
                            'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage multipublik tests')
32
                        utils.publish_coverage_native(
33
                            'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage multitenant tests')
34
                        utils.publish_coverage_native(
35
                            'index.html', 'htmlcov-coverage-django111-authentic', 'Coverage passerelle tests')
25
                            'index.html', 'htmlcov-coverage-passerelle', 'Coverage passerelle tests')
36 26
                        utils.publish_pylint('pylint.out')
37 27
                    }
38 28
                    junit 'junit-*.xml'
debian/control
10 10
Architecture: all
11 11
Depends: ${misc:Depends},
12 12
    ${python:Depends},
13
    python-django (>= 1:1.11),
13 14
    python-celery (>= 3.1.13),
14 15
    python-requests,
15 16
    python-raven,
......
19 20
    python-prometheus-client,
20 21
    python-djangorestframework,
21 22
    python-dnspython
22
Recommends: python-django (>= 1.8),
23
Recommends:
23 24
    python-gadjo,
24 25
    python-django-mellon (>= 1.2.22.26),
25 26
    memcached,
requirements.txt
1
django>=1.8,<1.9
1
django>=1.11,<1.12
2 2
-e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo
3 3
celery<4
4 4
django-mellon
setup.py
104 104
        'Programming Language :: Python',
105 105
        'Programming Language :: Python :: 2',
106 106
    ],
107
    install_requires=['django>=1.8, <1.12',
107
    install_requires=['django>=1.11, <1.12',
108 108
        'gadjo',
109 109
        'celery<4',
110 110
        'django-mellon',
tox.ini
4 4
# and then run "tox" from this directory.
5 5
[tox]
6 6
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo
7
envlist = coverage-{django18,django111}-{authentic,hobo,multipublik,multitenant,passerelle,schemas},
7
envlist = coverage-{authentic,hobo,multipublik,multitenant,passerelle,schemas},
8 8

  
9 9
[testenv]
10 10
basepython = python2
......
30 30
	coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=hobo/ --cov-config .coveragerc
31 31
	fast: NOMIGRATIONS=--nomigrations
32 32
deps:
33
	django18: django>=1.8,<1.9
34
	django111: django>=1.11,<1.12
35 33
	pytest<4.1
36 34
	pytest-cov
37 35
	pytest-django
......
44 42
	django-webtest<1.9.3
45 43
	celery<4
46 44
	Markdown<3
47
	django18: django-tables2<1.1
48
	django111: django-tables2<2.0
49
	django18: django-jsonfield<1.1
45
	django-tables2<2.0
50 46
	authentic: http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
51 47
	passerelle: http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
52 48
	passerelle: suds
53
-