Projet

Général

Profil

0003-django22-declare-django2.2-in-setup-and-tox-51125.patch

Nicolas Roche, 15 février 2021 15:41

Télécharger (1,96 ko)

Voir les différences: 

Subject: [PATCH 3/3] django22: declare django2.2 in setup and tox (#51125)


 setup.py | 2 +-
 tox.ini  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
setup.py
101 101 
        'Framework :: Django',
102 102 
        'Intended Audience :: Developers',
103 103 
        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
104 104 
        'Operating System :: OS Independent',
105 105 
        'Programming Language :: Python',
106 106 
        'Programming Language :: Python :: 2',
107 107 
    ],
108 108 
    install_requires=[
109 
        'django>=1.11, <1.12',
109 
        'django>=1.11, <2.3',
110 110 
    ],
111 111 
    zip_safe=False,
112 112 
    cmdclass={
113 113 
        'build': build,
114 114 
        'compile_translations': compile_translations,
115 115 
        'install_lib': install_lib,
116 116 
        'sdist': eo_sdist,
117 117 
    },
tox.ini
1 1 
[tox]
2 
envlist = py3-junit-coverage
2 
envlist = py3-django111-junit-coverage,py3-django22
3 3 
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle-montpellier-encombrants/{env:BRANCH_NAME:}
4 4 

  		




  5
  5
  
    
[testenv]

  		




  6
  6
  
    
usedevelop =

  		




  7
  7
  
    
  coverage: True

  		




  8
  8
  
    
  nocoverage: False

  		




  9
  9
  
    
setenv =

  		




  10
  10
  
    
  DJANGO_SETTINGS_MODULE=passerelle.settings

  		




  11
  11
  
    
  PASSERELLE_SETTINGS_FILE=tests/settings.py

  		




  12
  12
  
    
  DB_ENGINE=django.db.backends.postgresql_psycopg2

  		




  13
  13
  
    
  SETUPTOOLS_USE_DISTUTILS=stdlib

  		




  14
  14
  
    
  coverage: COVERAGE=--cov-report xml --cov-report html --cov=passerelle_montpellier_encombrants/

  		




  15
  15
  
    
  junit: JUNIT=--junitxml=junit-{envname}.xml

  		




  16
  16
  
    
deps =

  		




  
  17
  
    
  django111: django>=1.11, <1.12

  		




  
  18
  
    
  django22: django>=2.2, <2.3

  		




  17
  19
  
    
  https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz

  		




  18
  20
  
    
  psycopg2-binary

  		




  19
  21
  
    
  xmlschema<1.1

  		




  20
  22
  
    
  psycopg2

  		




  21
  23
  
    
  pytest

  		




  22
  24
  
    
  pytest-cov

  		




  23
  25
  
    
  pytest-django

  		




  24
  26
  
    
commands =

  		




  25
  
  
    
-