Projet

Général

Profil

0001-Enabled-django-3.2-testing-in-tox-file.patch

A. Berriot, 10 août 2022 15:22

Télécharger (4,14 ko)

Voir les différences:

Subject: [PATCH 1/6] Enabled django 3.2 testing in tox file

 Jenkinsfile | 10 +++++-----
 setup.py    |  2 +-
 tox.ini     | 19 ++++++++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)
Jenkinsfile
17 17
                        utils = new Utils()
18 18
                        utils.publish_coverage('coverage-*.xml')
19 19
                        utils.publish_coverage_native(
20
                            'index.html', 'htmlcov-py3-django22-drf312-coverage-authentic', 'Coverage authentic tests')
20
                            'index.html', 'htmlcov-py3-django22-coverage-authentic', 'Coverage authentic tests')
21 21
                        utils.publish_coverage_native(
22
                            'index.html', 'htmlcov-py3-django22-drf312-coverage-hobo', 'Coverage hobo tests')
22
                            'index.html', 'htmlcov-py3-django22-coverage-hobo', 'Coverage hobo tests')
23 23
                        utils.publish_coverage_native(
24
                            'index.html', 'htmlcov-py3-django22-drf312-coverage-multipublik', 'Coverage multipublik tests')
24
                            'index.html', 'htmlcov-py3-django22-coverage-multipublik', 'Coverage multipublik tests')
25 25
                        utils.publish_coverage_native(
26
                            'index.html', 'htmlcov-py3-django22-drf312-coverage-multitenant', 'Coverage multitenant tests')
26
                            'index.html', 'htmlcov-py3-django22-coverage-multitenant', 'Coverage multitenant tests')
27 27
                        utils.publish_coverage_native(
28
                            'index.html', 'htmlcov-py3-django22-drf312-coverage-passerelle', 'Coverage passerelle tests')
28
                            'index.html', 'htmlcov-py3-django22-coverage-passerelle', 'Coverage passerelle tests')
29 29
                        utils.publish_pylint('pylint.out')
30 30
                    }
31 31
                    mergeJunitResults()
setup.py
149 149
        'Programming Language :: Python',
150 150
    ],
151 151
    install_requires=[
152
        'django>=2.2, <2.3',
152
        'django>=2.2, <3.3',
153 153
        'gadjo',
154 154
        'celery<4' if sys.version_info < (3, 7) else 'celery>=4',
155 155
        'django-mellon',
tox.ini
5 5
[tox]
6 6
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:}
7 7
envlist =
8
  py3-django22-drf39-{hobo,authentic,multipublik,multitenant,schemas,passerelle}
9
  py3-django22-drf312-coverage-{hobo,authentic,multipublik,multitenant,schemas,passerelle}
8
  py3-django22-coverage-{hobo,authentic,multipublik,multitenant,schemas,passerelle}
9
  py3-django32-{hobo,authentic,multipublik,multitenant,schemas,passerelle}
10 10
  py3-black
11 11

  
12 12
[testenv]
......
35 35
	coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc 
36 36
	fast: NOMIGRATIONS=--nomigrations
37 37
deps:
38
	drf39: djangorestframework>=3.9.2,<3.10
39
	drf312: djangorestframework>=3.12,<3.13
38
	django22: djangorestframework>=3.9.2,<3.10
40 39
	django22: django>=2.2,<2.3
40
	django32: djangorestframework>=3.12,<3.13
41
	django32: django>=3.2,<3.3
41 42
	pytest!=6.0.0
42 43
	pytest-cov
43 44
	pytest-django
......
48 49
	django-mellon
49 50
	django-webtest
50 51
	Markdown<3
51
	django-tables2<2.0
52
	django22: django-tables2<2.0
53
	django32: django-tables2>=2.4<2.5
52 54
	authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
53 55
	passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
54 56
	passerelle: python-memcached
......
60 62
	pytest-freezegun
61 63
	xmlschema<1.1
62 64
	enum34<=1.1.6
63
	psycopg2<2.9
64
	psycopg2-binary<2.9
65
	django32: psycopg2
66
	django32: psycopg2-binary
67
  	django22: psycopg2<2.9
68
  	django22: psycopg2-binary<2.9
69

  
65 70
	black: pre-commit
66 71
commands =
67 72
	./getlasso3.sh
68
-