Projet

Général

Profil

0001-set-upper-bound-on-django-import-export-dependency-v.patch

Paul Marillonnet, 08 octobre 2019 12:38

Télécharger (3,36 ko)

Voir les différences: 

Subject: [PATCH] set upper bound on django-import-export dependency version
 (#36774)


 debian/control             |  1 +
 doc/installation_modes.rst |  2 +-
 setup.py                   |  2 +-
 tests/test_role_manager.py | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
debian/control
21 21 
    python-gadjo (>= 0.53),
22 22 
    python-django-tables2 (>= 1),
23 23 
    python-django-import-export (>= 0.2.7),
24 
    python-django-import-export (<= 0.4.5),
24 25 
    python-djangorestframework (>= 3.3),
25 26 
    python-markdown (>= 2.1),
26 27 
    python-ldap (>= 2.4),
doc/installation_modes.rst
21 21 
- django-select2>=4.3.0
22 22 
- django-tables2>=1.0
23 23 
- gadjo>=0.6
24 
- django-import-export>=0.2.7
24 
- django-import-export>=0.2.7,<=0.4.5
25 25 
- djangorestframework>=3.3
26 26 
- six>=1.9
27 27 
- Markdown>=2.5
setup.py
123 123 
          'Django-Select2>5,<6',
124 124 
          'django-tables2>=1.0,<2.0',
125 125 
          'gadjo>=0.53',
126 
          'django-import-export>=0.2.7',
126 
          'django-import-export>=0.2.7,<=0.4.5',
127 127 
          'djangorestframework>=3.3,<3.5',
128 128 
          'six>=1',
129 129 
          'Markdown>=2.1',
tests/test_role_manager.py
17 17 

  		




  18
  18
  
    

  		




  19
  19
  
    
def test_manager_role_export(app, admin, ou1, role_ou1, ou2, role_ou2):

  		




  
  20
  
    
    import csv

  		




  
  21
  
    

  		




  20
  22
  
    
    response = login(app, admin, 'a2-manager-roles')

  		




  21
  23
  
    

  		




  22
  24
  
    
    export_response = response.click('JSON')

  		




  ......




  26
  28
  
    
    assert len(export['roles']) == 2

  		




  27
  29
  
    
    assert set([role['slug'] for role in export['roles']]) == set(['role_ou1', 'role_ou2'])

  		




  28
  30
  
    

  		




  
  31
  
    
    export_response = response.click('CSV')

  		




  
  32
  
    
    reader = csv.reader(export_response.body.split('\r\n'), delimiter=',')

  		




  
  33
  
    
    rows = [row for row in reader]

  		




  
  34
  
    

  		




  
  35
  
    
    assert rows[0] == ['name', 'slug', 'members']

  		




  
  36
  
    
    assert len(rows)-2 == 2 # csv header and last EOL

  		




  
  37
  
    
    assert set([row[1] for row in rows[1:3]]) == set(['role_ou1', 'role_ou2'])

  		




  
  38
  
    

  		




  29
  39
  
    
    response.form.set('search-text', 'role_ou1')

  		




  30
  40
  
    
    search_response = response.form.submit()

  		




  31
  41
  
    

  		




  ......




  36
  46
  
    
    assert len(export['roles']) == 1

  		




  37
  47
  
    
    assert export['roles'][0]['slug'] == 'role_ou1'

  		




  38
  48
  
    

  		




  
  49
  
    
    export_response = search_response.click('CSV')

  		




  
  50
  
    
    reader = csv.reader(export_response.body.split('\r\n'), delimiter=',')

  		




  
  51
  
    
    rows = [row for row in reader]

  		




  
  52
  
    

  		




  
  53
  
    
    assert rows[0] == ['name', 'slug', 'members']

  		




  
  54
  
    
    assert len(rows)-2 == 1 # csv header and last EOL

  		




  
  55
  
    
    assert rows[1][1] == 'role_ou1'

  		




  
  56
  
    

  		




  39
  57
  
    

  		




  40
  58
  
    
def test_manager_role_name_uniqueness_single_ou(app, admin):

  		




  41
  59
  
    
    response = login(app, admin, 'a2-manager-roles')

  		




  42
  
  
    
-