Project: Switch to full app paths
Instead of inserting the path of the apps into the Python app, the apps are now referenced by their full import path. This app name claves with external or native Python libraries. Example: Mayan statistics app vs. Python new statistics library. Every app reference is now prepended with 'mayan.apps'. Existing config.yml files need to be updated manually. Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
default_app_config = 'document_parsing.apps.DocumentParsingApp'
|
||||
default_app_config = 'mayan.apps.document_parsing.apps.DocumentParsingApp'
|
||||
|
||||
@@ -5,8 +5,8 @@ from django.shortcuts import get_object_or_404
|
||||
from rest_framework import generics
|
||||
from rest_framework.response import Response
|
||||
|
||||
from documents.models import Document
|
||||
from rest_api.permissions import MayanPermission
|
||||
from mayan.apps.documents.models import Document
|
||||
from mayan.apps.rest_api.permissions import MayanPermission
|
||||
|
||||
from .models import DocumentPageContent
|
||||
from .permissions import permission_content_view
|
||||
|
||||
@@ -10,18 +10,18 @@ from django.db.models.signals import post_save
|
||||
from django.utils.timezone import now
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls import ModelPermission
|
||||
from common import (
|
||||
from mayan.apps.acls import ModelPermission
|
||||
from mayan.apps.common import (
|
||||
MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary,
|
||||
menu_tools
|
||||
)
|
||||
from common.classes import ModelAttribute, ModelField
|
||||
from common.settings import settings_db_sync_task_delay
|
||||
from documents.search import document_search, document_page_search
|
||||
from documents.signals import post_version_upload
|
||||
from documents.widgets import document_link
|
||||
from mayan.apps.common.classes import ModelAttribute, ModelField
|
||||
from mayan.apps.common.settings import settings_db_sync_task_delay
|
||||
from mayan.apps.documents.search import document_search, document_page_search
|
||||
from mayan.apps.documents.signals import post_version_upload
|
||||
from mayan.apps.documents.widgets import document_link
|
||||
from mayan.apps.navigation import SourceColumn
|
||||
from mayan.celery import app
|
||||
from navigation import SourceColumn
|
||||
|
||||
from .events import event_parsing_document_version_submit
|
||||
from .handlers import (
|
||||
@@ -66,9 +66,11 @@ def document_version_parsing_submit(self):
|
||||
|
||||
|
||||
class DocumentParsingApp(MayanAppConfig):
|
||||
app_namespace = 'document_parsing'
|
||||
app_url = 'parsing'
|
||||
has_rest_api = True
|
||||
has_tests = True
|
||||
name = 'document_parsing'
|
||||
name = 'mayan.apps.document_parsing'
|
||||
verbose_name = _('Document parsing')
|
||||
|
||||
def ready(self):
|
||||
@@ -147,7 +149,7 @@ class DocumentParsingApp(MayanAppConfig):
|
||||
|
||||
app.conf.CELERY_ROUTES.update(
|
||||
{
|
||||
'document_parsing.tasks.task_parse_document_version': {
|
||||
'mayan.apps.document_parsing.tasks.task_parse_document_version': {
|
||||
'queue': 'parsing'
|
||||
},
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from events import EventTypeNamespace
|
||||
from mayan.apps.events import EventTypeNamespace
|
||||
|
||||
namespace = EventTypeNamespace(
|
||||
name='document_parsing', label=_('Document parsing')
|
||||
|
||||
@@ -6,9 +6,9 @@ from django.utils.html import conditional_escape
|
||||
from django.utils.safestring import mark_safe
|
||||
from django.utils.translation import ugettext_lazy as _, ugettext
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from common.widgets import TextAreaDiv
|
||||
from documents.models import DocumentType
|
||||
from mayan.apps.acls.models import AccessControlList
|
||||
from mayan.apps.common.widgets import TextAreaDiv
|
||||
from mayan.apps.documents.models import DocumentType
|
||||
|
||||
from .models import DocumentPageContent
|
||||
from .permissions import permission_parse_document
|
||||
|
||||
@@ -4,7 +4,7 @@ import logging
|
||||
|
||||
from django.apps import apps
|
||||
|
||||
from document_indexing.tasks import task_index_document
|
||||
from mayan.apps.document_indexing.tasks import task_index_document
|
||||
|
||||
from .settings import setting_auto_parsing
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from appearance.classes import Icon
|
||||
from mayan.apps.appearance.classes import Icon
|
||||
|
||||
icon_document_content = Icon(driver_name='fontawesome', symbol='font')
|
||||
icon_document_parsing_errors_list = Icon(
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from navigation import Link, get_cascade_condition
|
||||
from mayan.apps.navigation import Link, get_cascade_condition
|
||||
|
||||
from .icons import (
|
||||
icon_document_content, icon_document_parsing_errors_list,
|
||||
|
||||
@@ -4,7 +4,9 @@ from django.db import models
|
||||
from django.utils.encoding import force_text, python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from documents.models import DocumentPage, DocumentType, DocumentVersion
|
||||
from mayan.apps.documents.models import (
|
||||
DocumentPage, DocumentType, DocumentVersion
|
||||
)
|
||||
|
||||
from .managers import DocumentPageContentManager, DocumentTypeSettingsManager
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import subprocess
|
||||
from django.apps import apps
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from common.utils import copyfile, fs_cleanup, mkstemp
|
||||
from mayan.apps.common.utils import copyfile, fs_cleanup, mkstemp
|
||||
|
||||
from .exceptions import ParserError
|
||||
from .settings import setting_pdftotext_path
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from permissions import PermissionNamespace
|
||||
from mayan.apps.permissions import PermissionNamespace
|
||||
|
||||
namespace = PermissionNamespace('document_parsing', _('Document parsing'))
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from task_manager.classes import CeleryQueue
|
||||
from mayan.apps.task_manager.classes import CeleryQueue
|
||||
|
||||
queue_ocr = CeleryQueue(name='parsing', label=_('Parsing'))
|
||||
queue_ocr.add_task_type(
|
||||
name='document_parsing.tasks.task_parse_document_version',
|
||||
name='mayan.apps.document_parsing.tasks.task_parse_document_version',
|
||||
label=_('Document version parsing')
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from smart_settings import Namespace
|
||||
from mayan.apps.smart_settings import Namespace
|
||||
|
||||
namespace = Namespace(name='document_parsing', label=_('Document parsing'))
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ from django.test import override_settings
|
||||
|
||||
from rest_framework import status
|
||||
|
||||
from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
from rest_api.tests import BaseAPITestCase
|
||||
from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
from mayan.apps.rest_api.tests import BaseAPITestCase
|
||||
|
||||
from ..permissions import permission_content_view
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
|
||||
|
||||
from actstream.models import Action
|
||||
|
||||
from documents.tests.literals import TEST_DOCUMENT_FILENAME
|
||||
from documents.tests.test_models import GenericDocumentTestCase
|
||||
from mayan.apps.documents.tests.literals import TEST_DOCUMENT_FILENAME
|
||||
from mayan.apps.documents.tests.test_models import GenericDocumentTestCase
|
||||
|
||||
from ..events import (
|
||||
event_parsing_document_version_submit,
|
||||
|
||||
@@ -2,11 +2,10 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings
|
||||
|
||||
from common.tests import BaseTestCase
|
||||
from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
|
||||
from document_indexing.models import Index, IndexInstanceNode
|
||||
from document_indexing.tests.literals import TEST_INDEX_LABEL
|
||||
from mayan.apps.common.tests import BaseTestCase
|
||||
from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
from mayan.apps.document_indexing.models import Index, IndexInstanceNode
|
||||
from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL
|
||||
|
||||
from .literals import TEST_PARSING_INDEX_NODE_TEMPLATE
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings
|
||||
|
||||
from documents.tests import GenericDocumentTestCase, TEST_HYBRID_DOCUMENT
|
||||
from mayan.apps.documents.tests import GenericDocumentTestCase, TEST_HYBRID_DOCUMENT
|
||||
|
||||
TEST_DOCUMENT_CONTENT = 'Sample text'
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings
|
||||
|
||||
from common.tests import BaseTestCase
|
||||
from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
from mayan.apps.common.tests import BaseTestCase
|
||||
from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
|
||||
|
||||
from ..parsers import PopplerParser
|
||||
|
||||
|
||||
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings
|
||||
|
||||
from documents.tests import GenericDocumentViewTestCase, TEST_HYBRID_DOCUMENT
|
||||
from mayan.apps.documents.tests import (
|
||||
GenericDocumentViewTestCase, TEST_HYBRID_DOCUMENT
|
||||
)
|
||||
|
||||
from ..permissions import (
|
||||
permission_content_view, permission_document_type_parsing_setup
|
||||
|
||||
@@ -6,11 +6,11 @@ from django.shortcuts import get_object_or_404
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.translation import ugettext_lazy as _, ungettext
|
||||
|
||||
from common.generics import (
|
||||
from mayan.apps.common.generics import (
|
||||
FormView, MultipleObjectConfirmActionView, SingleObjectDetailView,
|
||||
SingleObjectDownloadView, SingleObjectEditView, SingleObjectListView
|
||||
)
|
||||
from documents.models import Document, DocumentPage, DocumentType
|
||||
from mayan.apps.documents.models import Document, DocumentPage, DocumentType
|
||||
|
||||
from .forms import (
|
||||
DocumentContentForm, DocumentPageContentForm, DocumentTypeSelectForm
|
||||
|
||||
Reference in New Issue
Block a user