Projet

Général

Profil

0001-mdel-move-into-apps-15687.patch

Benjamin Dauvergne, 20 septembre 2019 21:57

Télécharger (7,28 ko)

Voir les différences:

Subject: [PATCH] mdel: move into apps/ (#15687)

 passerelle/{contrib => apps}/mdel/__init__.py               | 0
 passerelle/{contrib => apps}/mdel/mdel.py                   | 0
 .../{contrib => apps}/mdel/migrations/0001_initial.py       | 0
 .../mdel/migrations/0002_auto_20170123_0311.py              | 0
 .../mdel/migrations/0003_auto_20170125_0450.py              | 0
 .../mdel/migrations/0004_auto_20171220_1109.py              | 0
 .../mdel/migrations/0005_remove_mdel_log_level.py           | 0
 passerelle/{contrib => apps}/mdel/migrations/__init__.py    | 0
 passerelle/{contrib => apps}/mdel/models.py                 | 0
 .../{contrib => apps}/mdel/templates/mdel/mdel_detail.html  | 0
 passerelle/{contrib => apps}/mdel/utils.py                  | 0
 passerelle/settings.py                                      | 1 +
 tests/settings.py                                           | 1 -
 tests/test_generic_endpoint.py                              | 6 +++---
 tests/test_mdel.py                                          | 6 +++---
 15 files changed, 7 insertions(+), 7 deletions(-)
 rename passerelle/{contrib => apps}/mdel/__init__.py (100%)
 rename passerelle/{contrib => apps}/mdel/mdel.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0001_initial.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0002_auto_20170123_0311.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0003_auto_20170125_0450.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0004_auto_20171220_1109.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0005_remove_mdel_log_level.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/__init__.py (100%)
 rename passerelle/{contrib => apps}/mdel/models.py (100%)
 rename passerelle/{contrib => apps}/mdel/templates/mdel/mdel_detail.html (100%)
 rename passerelle/{contrib => apps}/mdel/utils.py (100%)
passerelle/settings.py
138 138
    'passerelle.apps.gdc',
139 139
    'passerelle.apps.jsondatastore',
140 140
    'passerelle.apps.sp_fr',
141
    'passerelle.apps.mdel',
141 142
    'passerelle.apps.mobyt',
142 143
    'passerelle.apps.okina',
143 144
    'passerelle.apps.opengis',
tests/settings.py
27 27
    'passerelle.contrib.iws',
28 28
    'passerelle.contrib.lille_urban_card',
29 29
    'passerelle.contrib.maarch',
30
    'passerelle.contrib.mdel',
31 30
    'passerelle.contrib.mdph13',
32 31
    'passerelle.contrib.meyzieu_newsletters',
33 32
    'passerelle.contrib.nancypoll',
tests/test_generic_endpoint.py
29 29

  
30 30
from passerelle.apps.arcgis.models import ArcGIS
31 31
from passerelle.base.models import ResourceLog, ProxyLogger, BaseResource, HTTPResource
32
from passerelle.contrib.mdel.models import MDEL
32
from passerelle.apps.mdel.models import MDEL
33 33
from passerelle.contrib.stub_invoices.models import StubInvoicesConnector
34 34
from passerelle.utils.api import endpoint
35 35

  
......
53 53
}
54 54

  
55 55

  
56
@mock.patch('passerelle.contrib.mdel.models.Demand.get_status', lambda x: DEMAND_STATUS)
57
@mock.patch('passerelle.contrib.mdel.models.Demand.create_zip', lambda x, y: '1-14-ILE-LA')
56
@mock.patch('passerelle.apps.mdel.models.Demand.get_status', lambda x: DEMAND_STATUS)
57
@mock.patch('passerelle.apps.mdel.models.Demand.create_zip', lambda x, y: '1-14-ILE-LA')
58 58
def test_generic_payload_logging(caplog, app, mdel):
59 59
    filename = os.path.join(os.path.dirname(__file__), 'data', 'mdel', 'formdata.json')
60 60
    payload = json.load(open(filename))
tests/test_mdel.py
27 27

  
28 28
import pytest
29 29

  
30
from passerelle.contrib.mdel.models import MDEL, Demand
31
from passerelle.contrib.mdel.mdel import Message, Description, AttachedFile, get_resource_base_dir
32
from passerelle.contrib.mdel.utils import parse_date
30
from passerelle.apps.mdel.models import MDEL, Demand
31
from passerelle.apps.mdel.mdel import Message, Description, AttachedFile, get_resource_base_dir
32
from passerelle.apps.mdel.utils import parse_date
33 33

  
34 34
import utils
35 35

  
36
-