From 0d8081ad9d480683b27662934192c751eea5dd92 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 30 Jun 2017 17:55:47 -0400 Subject: [PATCH] Rename the mayan_task_manager app to task_manager. Signed-off-by: Roberto Rosario --- mayan/apps/checkouts/queues.py | 2 +- mayan/apps/common/queues.py | 2 +- mayan/apps/document_indexing/queues.py | 2 +- mayan/apps/document_signatures/queues.py | 2 +- mayan/apps/document_states/queues.py | 2 +- mayan/apps/documents/queues.py | 2 +- mayan/apps/mailer/queues.py | 2 +- mayan/apps/mayan_task_manager/__init__.py | 3 --- mayan/apps/metadata/queues.py | 2 +- mayan/apps/ocr/queues.py | 2 +- mayan/apps/sources/queues.py | 2 +- mayan/apps/statistics/queues.py | 2 +- mayan/apps/task_manager/__init__.py | 3 +++ mayan/apps/{mayan_task_manager => task_manager}/apps.py | 2 +- mayan/apps/{mayan_task_manager => task_manager}/classes.py | 0 mayan/apps/{mayan_task_manager => task_manager}/links.py | 0 mayan/apps/{mayan_task_manager => task_manager}/permissions.py | 0 mayan/apps/{mayan_task_manager => task_manager}/urls.py | 0 mayan/apps/{mayan_task_manager => task_manager}/views.py | 0 mayan/settings/base.py | 2 +- 20 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 mayan/apps/mayan_task_manager/__init__.py create mode 100644 mayan/apps/task_manager/__init__.py rename mayan/apps/{mayan_task_manager => task_manager}/apps.py (98%) rename mayan/apps/{mayan_task_manager => task_manager}/classes.py (100%) rename mayan/apps/{mayan_task_manager => task_manager}/links.py (100%) rename mayan/apps/{mayan_task_manager => task_manager}/permissions.py (100%) rename mayan/apps/{mayan_task_manager => task_manager}/urls.py (100%) rename mayan/apps/{mayan_task_manager => task_manager}/views.py (100%) diff --git a/mayan/apps/checkouts/queues.py b/mayan/apps/checkouts/queues.py index 25f4a53f80..91896cda50 100644 --- a/mayan/apps/checkouts/queues.py +++ b/mayan/apps/checkouts/queues.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_checkouts_periodic = CeleryQueue( name='checkouts_periodic', label=_('Checkouts periodic'), transient=True diff --git a/mayan/apps/common/queues.py b/mayan/apps/common/queues.py index b003090fbf..b6cda215d0 100644 --- a/mayan/apps/common/queues.py +++ b/mayan/apps/common/queues.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_default = CeleryQueue( name='default', label=_('Default'), is_default_queue=True diff --git a/mayan/apps/document_indexing/queues.py b/mayan/apps/document_indexing/queues.py index c90e6d8f5e..50da37e06a 100644 --- a/mayan/apps/document_indexing/queues.py +++ b/mayan/apps/document_indexing/queues.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ from common.queues import queue_tools -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_indexing = CeleryQueue(name='indexing', label=_('Indexing')) diff --git a/mayan/apps/document_signatures/queues.py b/mayan/apps/document_signatures/queues.py index 07889c7d67..72614fe449 100644 --- a/mayan/apps/document_signatures/queues.py +++ b/mayan/apps/document_signatures/queues.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ from common.queues import queue_tools -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_signatures = CeleryQueue(name='signatures', label=_('Signatures')) queue_signatures.add_task_type( diff --git a/mayan/apps/document_states/queues.py b/mayan/apps/document_states/queues.py index 85e0eda78f..383fa77761 100644 --- a/mayan/apps/document_states/queues.py +++ b/mayan/apps/document_states/queues.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_document_states = CeleryQueue( name='document_states', label=_('Document states') diff --git a/mayan/apps/documents/queues.py b/mayan/apps/documents/queues.py index 68b8db7e5f..48ba1e4181 100644 --- a/mayan/apps/documents/queues.py +++ b/mayan/apps/documents/queues.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ from common.queues import queue_tools -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_converter = CeleryQueue( name='converter', label=_('Converter'), transient=True diff --git a/mayan/apps/mailer/queues.py b/mayan/apps/mailer/queues.py index 53a6607955..1eb461cfd9 100644 --- a/mayan/apps/mailer/queues.py +++ b/mayan/apps/mailer/queues.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_mailing = CeleryQueue( name='mailing', label=_('Mailing') diff --git a/mayan/apps/mayan_task_manager/__init__.py b/mayan/apps/mayan_task_manager/__init__.py deleted file mode 100644 index 7d0d10b17e..0000000000 --- a/mayan/apps/mayan_task_manager/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from __future__ import unicode_literals - -default_app_config = 'mayan_task_manager.apps.TaskManagerApp' diff --git a/mayan/apps/metadata/queues.py b/mayan/apps/metadata/queues.py index e0518dd5f3..94e714752b 100644 --- a/mayan/apps/metadata/queues.py +++ b/mayan/apps/metadata/queues.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_metadata = CeleryQueue( name='metadata', label=_('Metadata') diff --git a/mayan/apps/ocr/queues.py b/mayan/apps/ocr/queues.py index 5f6fb78750..92297a2524 100644 --- a/mayan/apps/ocr/queues.py +++ b/mayan/apps/ocr/queues.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_ocr = CeleryQueue(name='ocr', label=_('OCR')) queue_ocr.add_task_type( diff --git a/mayan/apps/sources/queues.py b/mayan/apps/sources/queues.py index c574b19b59..9902b7a1b0 100644 --- a/mayan/apps/sources/queues.py +++ b/mayan/apps/sources/queues.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_sources = CeleryQueue( name='sources', label=_('Sources'), transient=True diff --git a/mayan/apps/statistics/queues.py b/mayan/apps/statistics/queues.py index 1920f182b3..962c81af17 100644 --- a/mayan/apps/statistics/queues.py +++ b/mayan/apps/statistics/queues.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan_task_manager.classes import CeleryQueue +from task_manager.classes import CeleryQueue queue_statistics = CeleryQueue( name='statistics', label=_('Statistics'), transient=True diff --git a/mayan/apps/task_manager/__init__.py b/mayan/apps/task_manager/__init__.py new file mode 100644 index 0000000000..7340b19f7e --- /dev/null +++ b/mayan/apps/task_manager/__init__.py @@ -0,0 +1,3 @@ +from __future__ import unicode_literals + +default_app_config = 'task_manager.apps.TaskManagerApp' diff --git a/mayan/apps/mayan_task_manager/apps.py b/mayan/apps/task_manager/apps.py similarity index 98% rename from mayan/apps/mayan_task_manager/apps.py rename to mayan/apps/task_manager/apps.py index 0ebd1dcda1..462b69ad5b 100644 --- a/mayan/apps/mayan_task_manager/apps.py +++ b/mayan/apps/task_manager/apps.py @@ -19,7 +19,7 @@ from .links import ( class TaskManagerApp(MayanAppConfig): app_namespace = 'task_manager' app_url = 'task_manager' - name = 'mayan_task_manager' + name = 'task_manager' verbose_name = _('Task manager') def ready(self): diff --git a/mayan/apps/mayan_task_manager/classes.py b/mayan/apps/task_manager/classes.py similarity index 100% rename from mayan/apps/mayan_task_manager/classes.py rename to mayan/apps/task_manager/classes.py diff --git a/mayan/apps/mayan_task_manager/links.py b/mayan/apps/task_manager/links.py similarity index 100% rename from mayan/apps/mayan_task_manager/links.py rename to mayan/apps/task_manager/links.py diff --git a/mayan/apps/mayan_task_manager/permissions.py b/mayan/apps/task_manager/permissions.py similarity index 100% rename from mayan/apps/mayan_task_manager/permissions.py rename to mayan/apps/task_manager/permissions.py diff --git a/mayan/apps/mayan_task_manager/urls.py b/mayan/apps/task_manager/urls.py similarity index 100% rename from mayan/apps/mayan_task_manager/urls.py rename to mayan/apps/task_manager/urls.py diff --git a/mayan/apps/mayan_task_manager/views.py b/mayan/apps/task_manager/views.py similarity index 100% rename from mayan/apps/mayan_task_manager/views.py rename to mayan/apps/task_manager/views.py diff --git a/mayan/settings/base.py b/mayan/settings/base.py index 2950fd3e74..d13585e8ae 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -93,7 +93,6 @@ INSTALLED_APPS = ( # 'folders', 'linking', 'mailer', - 'mayan_task_manager', 'metadata', 'mirroring', 'motd', @@ -103,6 +102,7 @@ INSTALLED_APPS = ( 'statistics', 'storage', 'tags', + 'task_manager', # Placed after rest_api to allow template overriding 'rest_framework_swagger', )