From b5780c76c9c1c0874490a771d1f3bf309d150199 Mon Sep 17 00:00:00 2001
From: Peter Stanko <peter.stanko0@gmail.com>
Date: Fri, 10 Aug 2018 20:46:25 +0200
Subject: [PATCH] Updated name to async_celery since async is a keyword
---
Pipfile | 2 +-
portal/__init__.py | 7 ++++---
portal/{async => async_celery}/__init__.py | 2 +-
portal/{async => async_celery}/enqueue.py | 4 ++--
portal/{async => async_celery}/helpers.py | 0
portal/{async => async_celery}/storage.py | 4 ++--
portal/{async => async_celery}/tasks.py | 4 ++--
portal/logging.py | 2 --
portal/service/submissions.py | 8 ++++----
9 files changed, 16 insertions(+), 17 deletions(-)
rename portal/{async => async_celery}/__init__.py (93%)
rename portal/{async => async_celery}/enqueue.py (88%)
rename portal/{async => async_celery}/helpers.py (100%)
rename portal/{async => async_celery}/storage.py (89%)
rename portal/{async => async_celery}/tasks.py (92%)
diff --git a/Pipfile b/Pipfile
index 101897d..a653d6d 100644
--- a/Pipfile
+++ b/Pipfile
@@ -33,4 +33,4 @@ pytest-mock = "*"
mock = "*"
[requires]
-python_version = "3.6"
+python_version = "3.7"
diff --git a/portal/__init__.py b/portal/__init__.py
index a17d3ce..1ee69fa 100644
--- a/portal/__init__.py
+++ b/portal/__init__.py
@@ -91,8 +91,8 @@ def configure_extensions(app: Flask):
def configure_async(app: Flask):
- from portal import async
- async.init_app(app)
+ from portal import async_celery
+ async_celery.init_app(app)
def create_app(environment: str = None):
@@ -113,5 +113,6 @@ def create_app(environment: str = None):
def get_celery(app: Flask) -> Union[Celery, None]:
if not app.config.get('BROKER_URL'):
return None
- from portal.async import celery_app
+ from portal.async_celery import celery_app
return celery_app
+
diff --git a/portal/async/__init__.py b/portal/async_celery/__init__.py
similarity index 93%
rename from portal/async/__init__.py
rename to portal/async_celery/__init__.py
index 20caf4a..51df5b0 100644
--- a/portal/async/__init__.py
+++ b/portal/async_celery/__init__.py
@@ -5,7 +5,7 @@ celery_app = Celery()
def init_app(app: Flask) -> Flask:
- """Initializes the async module
+ """Initializes the async_celery module
Args:
app(Flask): Flask application
diff --git a/portal/async/enqueue.py b/portal/async_celery/enqueue.py
similarity index 88%
rename from portal/async/enqueue.py
rename to portal/async_celery/enqueue.py
index 77ff1a4..b9c891e 100644
--- a/portal/async/enqueue.py
+++ b/portal/async_celery/enqueue.py
@@ -1,7 +1,7 @@
import logging
-from portal.async import celery_app
-from portal.async.helpers import reset_task_id
+from portal.async_celery import celery_app
+from portal.async_celery.helpers import reset_task_id
from portal.database.models import Submission, SubmissionState
log = logging.getLogger(__name__)
diff --git a/portal/async/helpers.py b/portal/async_celery/helpers.py
similarity index 100%
rename from portal/async/helpers.py
rename to portal/async_celery/helpers.py
diff --git a/portal/async/storage.py b/portal/async_celery/storage.py
similarity index 89%
rename from portal/async/storage.py
rename to portal/async_celery/storage.py
index d83fb6c..67914fc 100644
--- a/portal/async/storage.py
+++ b/portal/async_celery/storage.py
@@ -1,7 +1,7 @@
import logging
-from portal.async import celery_app
-from portal.async.helpers import reset_task_id
+from portal.async_celery import celery_app
+from portal.async_celery.helpers import reset_task_id
from portal.database.models import Submission, SubmissionState
log = logging.getLogger(__name__)
diff --git a/portal/async/tasks.py b/portal/async_celery/tasks.py
similarity index 92%
rename from portal/async/tasks.py
rename to portal/async_celery/tasks.py
index 0843ea3..ed4a7f3 100644
--- a/portal/async/tasks.py
+++ b/portal/async_celery/tasks.py
@@ -1,8 +1,8 @@
from celery.utils.log import get_task_logger
from portal import storage
-from portal.async import celery_app
-from portal.async.storage import submission_store_ended
+from portal.async_celery import celery_app
+from portal.async_celery.storage import submission_store_ended
from portal.service.general import find_submission
log = get_task_logger(__name__)
diff --git a/portal/logging.py b/portal/logging.py
index 76026b9..d5a7f67 100644
--- a/portal/logging.py
+++ b/portal/logging.py
@@ -23,8 +23,6 @@ HANDLERS = {
}
LOGGERS = {
- 'flask': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
- 'flask_restplus': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
'portal': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
'tests': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
'management': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
diff --git a/portal/service/submissions.py b/portal/service/submissions.py
index 1e2a81b..af62695 100644
--- a/portal/service/submissions.py
+++ b/portal/service/submissions.py
@@ -6,10 +6,10 @@ import logging
from typing import Union
from celery.result import AsyncResult
-from portal.async import tasks
-from portal.async.enqueue import revoke_enqueue_task
-from portal.async.storage import revoke_storage_task
-from portal.async.tasks import clone_submission_files, upload_submission_to_storage
+from portal.async_celery import tasks
+from portal.async_celery.enqueue import revoke_enqueue_task
+from portal.async_celery.storage import revoke_storage_task
+from portal.async_celery.tasks import clone_submission_files, upload_submission_to_storage
from portal.database.models import Component, Project, Submission, SubmissionState, User
from portal.service.errors import ForbiddenError
from portal.service.general import delete_entity, write_entity
--
GitLab