Merge pull request City-of-Helsinki#103 from amanpdyadav/modularizing…

…-according-to-city Modularizing according to city
suutari-ai · Dec 20, 2019 · d185a67 · d185a67
2 parents 09307a6 + d7ce2e7
commit d185a67
Show file tree

Hide file tree

Showing 32 changed files with 17 additions and 23 deletions.
diff --git a/parkings/migrations/0013_parking_terminal_data.py b/parkings/migrations/0013_parking_terminal_data.py
@@ -4,11 +4,6 @@
 from django.db import migrations
 
 
-def load_parking_terminals_from_fixture(apps, schema_editor):
-    call_command('loaddata', 'parking_terminals',
-                 verbosity=0)
-
-
 def noop(apps, schema_editor):
     pass
 
@@ -19,7 +14,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(
-            code=load_parking_terminals_from_fixture,
-            reverse_code=noop),
+        migrations.RunPython(code=noop, reverse_code=noop),
     ]
diff --git a/parkkihubi/settings.py b/parkkihubi/settings.py
@@ -80,7 +80,8 @@
     'parkkihubi',
     'parkings',
     'sanitized_dump',
-]
+] + env.list("EXTRA_INSTALLED_APPS", default=['parkkihubi_hel'])
+
 
 if DEBUG and TIER == 'dev':
     # shell_plus and other goodies

diff --git a/parkkihubi_hel/__init__.py b/parkkihubi_hel/__init__.py
diff --git a/parkings/fixtures/parking_terminals.json → ...ihubi_hel/fixtures/parking_terminals.json b/parkings/fixtures/parking_terminals.json → ...ihubi_hel/fixtures/parking_terminals.json
diff --git a/parkings/importers/__init__.py → parkkihubi_hel/importers/__init__.py b/parkings/importers/__init__.py → parkkihubi_hel/importers/__init__.py
diff --git a/parkings/importers/parking_areas.py → parkkihubi_hel/importers/parking_areas.py b/parkings/importers/parking_areas.py → parkkihubi_hel/importers/parking_areas.py
@@ -119,7 +119,7 @@ def _parse_member(self, member):
         dates start reflecting the individual members update time it would be a
         good way to see if a member needs updating or not.
 
-        There is an example file parkings/tests/parking_area_importer_data.xml
+        There is an example file tests/parking_area_importer_data.xml
 
         :param member: The member XML element.
         :returns: A dict containing the fields origin_id, capacity_estimate

diff --git a/parkings/importers/payment_zones.py → parkkihubi_hel/importers/payment_zones.py b/parkings/importers/payment_zones.py → parkkihubi_hel/importers/payment_zones.py
diff --git a/parkings/importers/permit_areas.py → parkkihubi_hel/importers/permit_areas.py b/parkings/importers/permit_areas.py → parkkihubi_hel/importers/permit_areas.py
diff --git a/parkings/importers/regions.py → parkkihubi_hel/importers/regions.py b/parkings/importers/regions.py → parkkihubi_hel/importers/regions.py
@@ -3,7 +3,7 @@
 from django.contrib.gis.gdal import DataSource
 from django.contrib.gis.utils import LayerMapping
 
-from ..models import Region
+from parkings.models import Region
 
 
 class ShapeFileToRegionImporter(object):

diff --git a/parkings/importers/wfs_importer.py → parkkihubi_hel/importers/wfs_importer.py b/parkings/importers/wfs_importer.py → parkkihubi_hel/importers/wfs_importer.py
diff --git a/parkkihubi_hel/management/__init__.py b/parkkihubi_hel/management/__init__.py
diff --git a/parkkihubi_hel/management/commands/__init__.py b/parkkihubi_hel/management/commands/__init__.py
diff --git a/...nagement/commands/import_parking_areas.py → ...nagement/commands/import_parking_areas.py b/...nagement/commands/import_parking_areas.py → ...nagement/commands/import_parking_areas.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from parkings.importers import ParkingAreaImporter
+from ...importers import ParkingAreaImporter
 
 
 class Command(BaseCommand):

diff --git a/...nagement/commands/import_payment_zones.py → ...nagement/commands/import_payment_zones.py b/...nagement/commands/import_payment_zones.py → ...nagement/commands/import_payment_zones.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from parkings.importers import PaymentZoneImporter
+from ...importers import PaymentZoneImporter
 
 
 class Command(BaseCommand):

diff --git a/...anagement/commands/import_permit_areas.py → ...anagement/commands/import_permit_areas.py b/...anagement/commands/import_permit_areas.py → ...anagement/commands/import_permit_areas.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from parkings.importers import PermitAreaImporter
+from ...importers import PermitAreaImporter
 
 
 class Command(BaseCommand):

diff --git a/...ngs/management/commands/import_regions.py → ...hel/management/commands/import_regions.py b/...ngs/management/commands/import_regions.py → ...hel/management/commands/import_regions.py
diff --git a/parkkihubi_hel/tests/__init__.py b/parkkihubi_hel/tests/__init__.py
diff --git a/...ings/tests/parking_area_importer_data.xml → ..._hel/tests/parking_area_importer_data.xml b/...ings/tests/parking_area_importer_data.xml → ..._hel/tests/parking_area_importer_data.xml
diff --git a/...ings/tests/payment_zone_importer_data.xml → ..._hel/tests/payment_zone_importer_data.xml b/...ings/tests/payment_zone_importer_data.xml → ..._hel/tests/payment_zone_importer_data.xml
diff --git a/parkings/tests/permit_area_importer_data.xml → ...i_hel/tests/permit_area_importer_data.xml b/parkings/tests/permit_area_importer_data.xml → ...i_hel/tests/permit_area_importer_data.xml
diff --git a/parkings/tests/request_mocking.py → parkkihubi_hel/tests/request_mocking.py b/parkings/tests/request_mocking.py → parkkihubi_hel/tests/request_mocking.py
diff --git a/parkings/tests/test-features.dbf → parkkihubi_hel/tests/test-features.dbf b/parkings/tests/test-features.dbf → parkkihubi_hel/tests/test-features.dbf
diff --git a/parkings/tests/test-features.prj → parkkihubi_hel/tests/test-features.prj b/parkings/tests/test-features.prj → parkkihubi_hel/tests/test-features.prj
diff --git a/parkings/tests/test-features.shp → parkkihubi_hel/tests/test-features.shp b/parkings/tests/test-features.shp → parkkihubi_hel/tests/test-features.shp
diff --git a/parkings/tests/test-features.shx → parkkihubi_hel/tests/test-features.shx b/parkings/tests/test-features.shx → parkkihubi_hel/tests/test-features.shx
diff --git a/...sts/test_importing_management_commands.py → ...sts/test_importing_management_commands.py b/...sts/test_importing_management_commands.py → ...sts/test_importing_management_commands.py
@@ -1,10 +1,10 @@
 import pytest
 from django.core.management import call_command
 
-from parkings.management.commands import (
-    import_parking_areas, import_payment_zones, import_permit_areas)
 from parkings.models import ParkingArea, PaymentZone, PermitArea
 
+from ..management.commands import (
+    import_parking_areas, import_payment_zones, import_permit_areas)
 from .request_mocking import mocked_requests
 
 

diff --git a/parkings/tests/test_parking_area_importer.py → ...i_hel/tests/test_parking_area_importer.py b/parkings/tests/test_parking_area_importer.py → ...i_hel/tests/test_parking_area_importer.py
@@ -1,6 +1,6 @@
 import os
 
-from parkings.importers import ParkingAreaImporter
+from ..importers import ParkingAreaImporter
 
 mydir = os.path.dirname(__file__)
 sample_xml_file = os.path.join(mydir, 'parking_area_importer_data.xml')

diff --git a/parkings/tests/test_payment_zone_importer.py → ...i_hel/tests/test_payment_zone_importer.py b/parkings/tests/test_payment_zone_importer.py → ...i_hel/tests/test_payment_zone_importer.py
@@ -1,6 +1,6 @@
 import os
 
-from parkings.importers import PaymentZoneImporter
+from ..importers import PaymentZoneImporter
 
 mydir = os.path.dirname(__file__)
 

diff --git a/parkings/tests/test_permit_area_importer.py → ...bi_hel/tests/test_permit_area_importer.py b/parkings/tests/test_permit_area_importer.py → ...bi_hel/tests/test_permit_area_importer.py
@@ -1,6 +1,6 @@
 import os
 
-from parkings.importers import PermitAreaImporter
+from ..importers import PermitAreaImporter
 
 mydir = os.path.dirname(__file__)
 

diff --git a/parkings/tests/test_region_importer.py → parkkihubi_hel/tests/test_region_importer.py b/parkings/tests/test_region_importer.py → parkkihubi_hel/tests/test_region_importer.py
@@ -2,11 +2,11 @@
 
 import pytest
 
-from parkings.importers.regions import ShapeFileToRegionImporter
-from parkings.management.commands import import_regions
 from parkings.models import Region
+from parkings.tests.utils import approx, call_mgmt_cmd_with_output
 
-from .utils import approx, call_mgmt_cmd_with_output
+from ..importers.regions import ShapeFileToRegionImporter
+from ..management.commands import import_regions
 
 directory = os.path.abspath(os.path.dirname(__file__))
 

diff --git a/parkings/tests/wfs_capabilities_response.xml → ...i_hel/tests/wfs_capabilities_response.xml b/parkings/tests/wfs_capabilities_response.xml → ...i_hel/tests/wfs_capabilities_response.xml
diff --git a/setup.cfg b/setup.cfg
@@ -23,7 +23,7 @@ filterwarnings =
 
 [isort]
 default_section=THIRDPARTY
-known_first_party=parkkihubi,parkings
+known_first_party=parkkihubi,parkings,parkkihubi_hel
 line_length=79
 multi_line_output=4
 not_skip=__init__.py