Projet

Général

Profil

0001-general-stop-supporting-django-1.8-32728.patch

Frédéric Péters, 01 mai 2019 15:57

Télécharger (2,25 ko)

Voir les différences: 

Subject: [PATCH] general: stop supporting django 1.8 (#32728)


 Jenkinsfile    | 2 +-
 debian/control | 2 +-
 setup.py       | 2 +-
 tox.ini        | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
Jenkinsfile
23 23 
            steps {
24 24 
                script {
25 25 
                    if (env.JOB_NAME == 'chrono' && env.GIT_BRANCH == 'origin/master') {
26 
                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder chrono'
26 
                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch chrono'
27 27 
                    }
28 28 
                }
29 29 
            }
debian/control
9 9 
Package: python-chrono
10 10 
Architecture: all
11 11 
Depends: ${misc:Depends}, ${python:Depends},
12 
    python-django (>= 1.8),
12 
    python-django (>= 1:1.11),
13 13 
    python-gadjo,
14 14 
    python-requests
15 15 
Recommends: python-django-mellon
setup.py
147 147 
        'Programming Language :: Python :: 2',
148 148 
        'Programming Language :: Python :: 3',
149 149 
    ],
150 
    install_requires=['django>=1.8, <1.12',
150 
    install_requires=['django>=1.11, <1.12',
151 151 
        'gadjo',
152 152 
        'djangorestframework>=3.1, <3.7',
153 153 
        'django-jsonfield >= 0.9.3',
tox.ini
1 1 
[tox]
2 
envlist = py2-coverage-django18-pylint,{py2,py3}-coverage-django111
2 
envlist = py2-coverage-django111-pylint,py3-coverage-django111
3 3 
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/chrono/{env:BRANCH_NAME:}
4 4 

  		




  5
  5
  
    
[testenv]

  		




  ......




  11
  11
  
    
  CHRONO_SETTINGS_FILE=tests/settings.py

  		




  12
  12
  
    
  coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov-report html --cov=chrono/

  		




  13
  13
  
    
deps =

  		




  14
  
  
    
  django18: django>=1.8,<1.9

  		




  15
  14
  
    
  django111: django>=1.11,<1.12

  		




  16
  15
  
    
  pytest-cov

  		




  17
  16
  
    
  pytest-django

  		




  18
  
  
    
-