From 0cc54c827863247ac3b8b24e3f7f2f7142fd5afc Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Fri, 2 Nov 2018 18:48:50 +0100
Subject: [PATCH 2/2] move ArcGIS from contrib to apps (#17763)

---
 passerelle/{contrib => apps}/arcgis/__init__.py                 | 0
 passerelle/{contrib => apps}/arcgis/migrations/0001_initial.py  | 0
 .../arcgis/migrations/0002_auto_20170920_0951.py                | 0
 .../arcgis/migrations/0003_auto_20181102_1550.py                | 0
 passerelle/{contrib => apps}/arcgis/migrations/__init__.py      | 0
 passerelle/{contrib => apps}/arcgis/models.py                   | 0
 passerelle/settings.py                                          | 1 +
 tests/settings.py                                               | 1 -
 tests/test_arcgis.py                                            | 2 +-
 tests/test_arcgis_nancy.py                                      | 2 +-
 tests/test_generic_endpoint.py                                  | 2 +-
 11 files changed, 4 insertions(+), 4 deletions(-)
 rename passerelle/{contrib => apps}/arcgis/__init__.py (100%)
 rename passerelle/{contrib => apps}/arcgis/migrations/0001_initial.py (100%)
 rename passerelle/{contrib => apps}/arcgis/migrations/0002_auto_20170920_0951.py (100%)
 rename passerelle/{contrib => apps}/arcgis/migrations/0003_auto_20181102_1550.py (100%)
 rename passerelle/{contrib => apps}/arcgis/migrations/__init__.py (100%)
 rename passerelle/{contrib => apps}/arcgis/models.py (100%)

diff --git a/passerelle/contrib/arcgis/__init__.py b/passerelle/apps/arcgis/__init__.py
similarity index 100%
rename from passerelle/contrib/arcgis/__init__.py
rename to passerelle/apps/arcgis/__init__.py
diff --git a/passerelle/contrib/arcgis/migrations/0001_initial.py b/passerelle/apps/arcgis/migrations/0001_initial.py
similarity index 100%
rename from passerelle/contrib/arcgis/migrations/0001_initial.py
rename to passerelle/apps/arcgis/migrations/0001_initial.py
diff --git a/passerelle/contrib/arcgis/migrations/0002_auto_20170920_0951.py b/passerelle/apps/arcgis/migrations/0002_auto_20170920_0951.py
similarity index 100%
rename from passerelle/contrib/arcgis/migrations/0002_auto_20170920_0951.py
rename to passerelle/apps/arcgis/migrations/0002_auto_20170920_0951.py
diff --git a/passerelle/contrib/arcgis/migrations/0003_auto_20181102_1550.py b/passerelle/apps/arcgis/migrations/0003_auto_20181102_1550.py
similarity index 100%
rename from passerelle/contrib/arcgis/migrations/0003_auto_20181102_1550.py
rename to passerelle/apps/arcgis/migrations/0003_auto_20181102_1550.py
diff --git a/passerelle/contrib/arcgis/migrations/__init__.py b/passerelle/apps/arcgis/migrations/__init__.py
similarity index 100%
rename from passerelle/contrib/arcgis/migrations/__init__.py
rename to passerelle/apps/arcgis/migrations/__init__.py
diff --git a/passerelle/contrib/arcgis/models.py b/passerelle/apps/arcgis/models.py
similarity index 100%
rename from passerelle/contrib/arcgis/models.py
rename to passerelle/apps/arcgis/models.py
diff --git a/passerelle/settings.py b/passerelle/settings.py
index 715e747..684ff03 100644
--- a/passerelle/settings.py
+++ b/passerelle/settings.py
@@ -119,6 +119,7 @@ INSTALLED_APPS = (
     'passerelle.apps.airquality',
     'passerelle.apps.api_particulier',
     'passerelle.apps.atos_genesys',
+    'passerelle.apps.arcgis',
     'passerelle.apps.base_adresse',
     'passerelle.apps.bdp',
     'passerelle.apps.choosit',
diff --git a/tests/settings.py b/tests/settings.py
index 93c24f5..737345c 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -15,7 +15,6 @@ KNOWN_SERVICES = {
 INSTALLED_APPS += (
         'passerelle.contrib.adict',
         'passerelle.contrib.agoraplus',
-        'passerelle.contrib.arcgis',
         'passerelle.contrib.dpark',
         'passerelle.contrib.fake_family',
         'passerelle.contrib.gdema',
diff --git a/tests/test_arcgis.py b/tests/test_arcgis.py
index d7c61ef..3c19705 100644
--- a/tests/test_arcgis.py
+++ b/tests/test_arcgis.py
@@ -5,7 +5,7 @@ import utils
 
 from django.contrib.contenttypes.models import ContentType
 
-from passerelle.contrib.arcgis.models import ArcGIS
+from passerelle.apps.arcgis.models import ArcGIS
 from passerelle.base.models import ApiUser, AccessRight
 
 # from http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/fold/serv/MapServer/1
diff --git a/tests/test_arcgis_nancy.py b/tests/test_arcgis_nancy.py
index eb75ad1..5bbd73d 100644
--- a/tests/test_arcgis_nancy.py
+++ b/tests/test_arcgis_nancy.py
@@ -8,8 +8,8 @@ import mock
 from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
 
+from passerelle.apps.arcgis.models import ArcGIS
 from passerelle.base.models import ApiUser, AccessRight
-from passerelle.contrib.arcgis.models import ArcGIS
 
 
 TEST_BASE_DIR = os.path.join(os.path.dirname(__file__), 'data', 'nancy_arcgis')
diff --git a/tests/test_generic_endpoint.py b/tests/test_generic_endpoint.py
index f2b19ac..6eb60ab 100644
--- a/tests/test_generic_endpoint.py
+++ b/tests/test_generic_endpoint.py
@@ -26,9 +26,9 @@ import pytest
 
 import utils
 
+from passerelle.apps.arcgis.models import ArcGIS
 from passerelle.base.models import BaseResource, ResourceLog, ProxyLogger
 from passerelle.contrib.mdel.models import MDEL
-from passerelle.contrib.arcgis.models import ArcGIS
 from passerelle.contrib.stub_invoices.models import StubInvoicesConnector
 from passerelle.utils.api import endpoint
 
-- 
2.19.1