diff --git a/arkindex/documents/models.py b/arkindex/documents/models.py index 87d18221213d034ede8a150fbbaa79e542aae064..b8a2fca572ea344c0a6fa461a9c99164e5acbe4d 100644 --- a/arkindex/documents/models.py +++ b/arkindex/documents/models.py @@ -1,7 +1,7 @@ from django.db import models from django.urls import reverse from enumfields import EnumField, Enum -from arkindex.models import IndexableModel +from arkindex.project.models import IndexableModel from documents.managers import ElementManager import uuid diff --git a/arkindex/documents/serializers.py b/arkindex/documents/serializers.py index 98c2b4f0ec3afdd9343053089c406e98839ecf8c..adec1edc899de036754846bd6472463f11ffece1 100644 --- a/arkindex/documents/serializers.py +++ b/arkindex/documents/serializers.py @@ -3,7 +3,7 @@ from django.conf import settings from documents.models import Element, Transcription, Page, ElementType from images.models import Image, Zone from images.serializers import ZoneSerializer, ImageSerializer -from arkindex.tools import sslify_url +from arkindex.project.tools import sslify_url class EnumField(serializers.Field): diff --git a/arkindex/images/importer.py b/arkindex/images/importer.py index 742ad1cbaf6c4c3c337dd2eba1b87ff16b325c40..373e8d033b17ef67218882f96ea77d0bcd7d4f71 100644 --- a/arkindex/images/importer.py +++ b/arkindex/images/importer.py @@ -1,6 +1,6 @@ from images.models import Zone, Image from documents.models import Transcription, ElementLink -from arkindex.tools import BoundingBox +from arkindex.project.tools import BoundingBox import os import re import gzip diff --git a/arkindex/images/models.py b/arkindex/images/models.py index 552085311e42248f8b4c656d40687381e1cfc4b2..d270d5689e8d0fca19b822862942ee2f41753558 100644 --- a/arkindex/images/models.py +++ b/arkindex/images/models.py @@ -5,8 +5,8 @@ from django.utils.functional import cached_property from elasticsearch import Elasticsearch from elasticsearch.helpers import bulk as es_bulk from documents.models import Transcription -from arkindex.models import IndexableModel -from arkindex.tools import BoundingBox +from arkindex.project.models import IndexableModel +from arkindex.project.tools import BoundingBox import requests import urllib.parse diff --git a/arkindex/manage.py b/arkindex/manage.py index 1e7dd70801735e1057802831badf0eb3c0395e4a..2278abfce086c968f1bd551a0640d10b7a8a8769 100755 --- a/arkindex/manage.py +++ b/arkindex/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "arkindex.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "arkindex.project.settings") try: from django.core.management import execute_from_command_line except ImportError: diff --git a/arkindex/arkindex/__init__.py b/arkindex/project/__init__.py similarity index 100% rename from arkindex/arkindex/__init__.py rename to arkindex/project/__init__.py diff --git a/arkindex/arkindex/api_v1.py b/arkindex/project/api_v1.py similarity index 100% rename from arkindex/arkindex/api_v1.py rename to arkindex/project/api_v1.py diff --git a/arkindex/arkindex/models.py b/arkindex/project/models.py similarity index 100% rename from arkindex/arkindex/models.py rename to arkindex/project/models.py diff --git a/arkindex/arkindex/settings.py b/arkindex/project/settings.py similarity index 98% rename from arkindex/arkindex/settings.py rename to arkindex/project/settings.py index 17ec326720aedad67ce9144c8f53a64cba57c8d0..1d11d4ef771d221b863bc3a6f4548289f7d03c06 100644 --- a/arkindex/arkindex/settings.py +++ b/arkindex/project/settings.py @@ -59,7 +59,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'arkindex.urls' +ROOT_URLCONF = 'arkindex.project.urls' TEMPLATES = [ { @@ -79,7 +79,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'arkindex.wsgi.application' +WSGI_APPLICATION = 'arkindex.project.wsgi.application' # Database diff --git a/arkindex/arkindex/tools.py b/arkindex/project/tools.py similarity index 100% rename from arkindex/arkindex/tools.py rename to arkindex/project/tools.py diff --git a/arkindex/arkindex/urls.py b/arkindex/project/urls.py similarity index 85% rename from arkindex/arkindex/urls.py rename to arkindex/project/urls.py index dfebd81ca56285f1334157086a5743d1aabe12af..50068c101054c23fbf743729f645e3f14adab108 100644 --- a/arkindex/arkindex/urls.py +++ b/arkindex/project/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url, include from django.contrib import admin -from arkindex.api_v1 import api +from arkindex.project.api_v1 import api urlpatterns = [ url(r'^api/v1/', include((api, 'api'), namespace='api')), diff --git a/arkindex/arkindex/views.py b/arkindex/project/views.py similarity index 100% rename from arkindex/arkindex/views.py rename to arkindex/project/views.py diff --git a/arkindex/arkindex/wsgi.py b/arkindex/project/wsgi.py similarity index 80% rename from arkindex/arkindex/wsgi.py rename to arkindex/project/wsgi.py index 9b5740e40cb147f9b34dfe6f3aba634ed5cef0c4..b3bd1b3c8b5d560e1ee1cf27aa95119ae7da01de 100644 --- a/arkindex/arkindex/wsgi.py +++ b/arkindex/project/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "arkindex.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "arkindex.project.settings") application = get_wsgi_application()