Projet

Général

Profil

0001-add-support-of-Django-1.11-19614.patch

Serghei Mihai (congés, retour 15/05), 25 octobre 2017 15:42

Télécharger (1,93 ko)

Voir les différences: 

Subject: [PATCH] add support of Django 1.11 (#19614)


 corbo/settings.py | 2 +-
 requirements.txt  | 2 +-
 setup.py          | 2 +-
 tox.ini           | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
corbo/settings.py
82 82 

  		




  83
  83
  
    
USE_TZ = True

  		




  84
  84
  
    

  		




  85
  
  
    
STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',)

  		




  
  85
  
    
STATICFILES_FINDERS = tuple(global_settings.STATICFILES_FINDERS) + ('gadjo.finders.XStaticFinder',)

  		




  86
  86
  
    

  		




  87
  87
  
    

  		




  88
  88
  
    
# Static files (CSS, JavaScript, Images)

  		












  

    
      requirements.txt
    
  





  1
  
  
    
Django>1.7, <1.9

  		




  
  1
  
    
Django>1.7, <1.12

  		




  2
  2
  
    
django-ckeditor<4.5.3

  		




  3
  3
  
    
djangorestframework>=3.3,<3.4

  		




  4
  4
  
    
html2text

  		












  

    
      setup.py
    
  





  93
  93
  
    
        'Programming Language :: Python',

  		




  94
  94
  
    
        'Programming Language :: Python :: 2',

  		




  95
  95
  
    
    ],

  		




  96
  
  
    
    install_requires=['django>1.7, <1.9',

  		




  
  96
  
    
    install_requires=['django>1.7, <1.12',

  		




  97
  97
  
    
        'django-ckeditor<4.5.3',

  		




  98
  98
  
    
        'djangorestframework>=3.3,<3.4',

  		




  99
  99
  
    
        'html2text',

  		












  

    
      tox.ini
    
  





  1
  1
  
    
[tox]

  		




  2
  
  
    
envlist = coverage-django18

  		




  
  2
  
    
envlist = coverage-django18,coverage-django111

  		




  3
  3
  
    

  		




  4
  4
  
    
[testenv]

  		




  5
  5
  
    
usedevelop =

  		




  ......




  10
  10
  
    
  coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=corbo/ --cov-config .coveragerc

  		




  11
  11
  
    
deps =

  		




  12
  12
  
    
  django18: django>=1.8,<1.9

  		




  
  13
  
    
  django111: django>=1.11,<1.12

  		




  13
  14
  
    
  http://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz

  		




  14
  15
  
    
  pytest-cov

  		




  15
  16
  
    
  pytest-django>=3.1.1

  		




  16
  
  
    
-