upgrade celery

6 files changed, 19 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index a0e87b85..872f2228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.pyc
 blocks/blocks/*/migrations/*.py
 blocks/*/migrations/*.py
-blocks/env/
+blocks/env*/
 .env
 tags
 Xcos/U*.sci
diff --git a/blocks/requirements.txt b/blocks/requirements.txt
index 4635845e..a3fb359f 100644
--- a/blocks/requirements.txt
+++ b/blocks/requirements.txt
@@ -1,15 +1,15 @@
-amqp==5.0.1
+amqp==5.0.9
 asgiref==3.3.4
-billiard==3.6.3.0
+billiard==3.6.4.0
 cairocffi==1.2.0
 CairoSVG==2.5.2
-celery==5.0.0
+celery==5.2.3
 certifi==2020.6.20
 cffi==1.14.5
 chardet==3.0.4
-click==7.1.2
+click==8.0.3
 click-didyoumean==0.0.3
-click-repl==0.1.6
+click-repl==0.2.0
 cssselect2==0.4.1
 defusedxml==0.7.1
 Django==3.2.10
@@ -21,7 +21,7 @@ flake8==3.8.3
 idna==2.10
 imageio==2.9.0
 importlib-metadata==1.7.0
-kombu==5.0.2
+kombu==5.2.3
 mccabe==0.6.1
 mysqlclient==2.0.1
 numpy==1.19.5
@@ -30,7 +30,7 @@ prompt-toolkit==3.0.7
 pycodestyle==2.6.0
 pycparser==2.20
 pyflakes==2.2.0
-pytz==2020.1
+pytz==2021.3
 PyYAML==5.4.1
 redis==3.5.3
 requests==2.25.1
diff --git a/blocks/simulationAPI/helpers/ngspice_helper.py b/blocks/simulationAPI/helpers/ngspice_helper.py
index 7f1f5185..179b6659 100644
--- a/blocks/simulationAPI/helpers/ngspice_helper.py
+++ b/blocks/simulationAPI/helpers/ngspice_helper.py
@@ -1,14 +1,14 @@
 import os
-import logging
 import re
 import subprocess
 from celery import current_task
+from celery.utils.log import get_task_logger
 from datetime import datetime
 from pathlib import Path
 from tempfile import mkstemp
 from django.conf import settings
 
-logger = logging.getLogger(__name__)
+logger = get_task_logger(__name__)
 MxGraphParser = os.path.join(settings.BASE_DIR, '../Xcos/MxGraphParser.py')
 SCILAB_DIR = os.path.abspath(settings.SCILAB_DIR)
 SCILAB = os.path.join(SCILAB_DIR, 'bin', 'scilab-adv-cli')
diff --git a/blocks/simulationAPI/serializers.py b/blocks/simulationAPI/serializers.py
index ee7da0fe..b0765f56 100644
--- a/blocks/simulationAPI/serializers.py
+++ b/blocks/simulationAPI/serializers.py
@@ -1,9 +1,10 @@
 import json
-import logging
+from celery.utils.log import get_task_logger
 from rest_framework import serializers
+
 from simulationAPI.models import TaskFile, Task
 
-logger = logging.getLogger(__name__)
+logger = get_task_logger(__name__)
 
 
 class TaskFileSerializer(serializers.ModelSerializer):
diff --git a/blocks/simulationAPI/tasks.py b/blocks/simulationAPI/tasks.py
index 9ec1c4ea..2fa11f6a 100644
--- a/blocks/simulationAPI/tasks.py
+++ b/blocks/simulationAPI/tasks.py
@@ -1,14 +1,14 @@
-from celery import shared_task, current_task, states
-from celery.exceptions import Ignore
 import json
-import logging
 import traceback
+from celery import shared_task, current_task, states
+from celery.exceptions import Ignore
+from celery.utils.log import get_task_logger
 
 from simulationAPI.helpers import ngspice_helper
 from simulationAPI.models import TaskFile
 
 
-logger = logging.getLogger(__name__)
+logger = get_task_logger(__name__)
 
 
 @shared_task
diff --git a/blocks/simulationAPI/views.py b/blocks/simulationAPI/views.py
index 11261352..7113f70a 100644
--- a/blocks/simulationAPI/views.py
+++ b/blocks/simulationAPI/views.py
@@ -1,8 +1,8 @@
-import logging
 import os
 import time
 import uuid
 from celery.result import AsyncResult
+from celery.utils.log import get_task_logger
 from django.http import StreamingHttpResponse
 from rest_framework import status
 from rest_framework.exceptions import ValidationError
@@ -31,7 +31,7 @@ DATA = 2
 # to indicate there is no line in log file further
 NOLINE = -1
 
-logger = logging.getLogger(__name__)
+logger = get_task_logger(__name__)
 
 
 class XmlUploader(APIView):