Python Requirements Update (#89)

* chore: Updating Python Requirements

* refactor: Fix pylint warnings

Co-authored-by: Usama Sadiq <[email protected]>

Author: edx-requirements-bot

celery_utils/logged_task.py

@@ -22,7 +22,7 @@ def apply_async(self, args=None, kwargs=None, **options):  # pylint: disable=arg
         Emit a log statement when the task is submitted.
         """
         result = super().apply_async(args=args, kwargs=kwargs, **options)
-        log.info('Task {}[{}] submitted with arguments {}, {}'.format(
+        log.info('Task {}[{}] submitted with arguments {}, {}'.format(  # pylint: disable=consider-using-f-string
             self.name,
             result.id,
             args,
@@ -35,11 +35,19 @@ def on_retry(self, exc, task_id, args, kwargs, einfo):
         Capture the exception that caused the task to be retried, if any.
         """
         super().on_retry(exc, task_id, args, kwargs, einfo)
-        log.warning('[{}] retried due to {}'.format(task_id, getattr(einfo, 'traceback', None)))
+        log.warning(
+            '[{}] retried due to {}'.format(  # pylint: disable=consider-using-f-string
+                task_id, getattr(einfo, 'traceback', None)
+            )
+        )
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         """
         Capture the exception that caused the task to fail, if any.
         """
-        log.error('[{}] failed due to {}'.format(task_id, getattr(einfo, 'traceback', None)))
+        log.error(
+            '[{}] failed due to {}'.format(  # pylint: disable=consider-using-f-string
+                task_id, getattr(einfo, 'traceback', None)
+            )
+        )
         super().on_failure(exc, task_id, args, kwargs, einfo)

celery_utils/management/commands/cleanup_resolved_tasks.py

@@ -49,10 +49,12 @@ def handle(self, *args, **options):
         tasks = FailedTask.objects.filter(datetime_resolved__lt=now() - timedelta(days=options['age']))
         if options['task_name'] is not None:
             tasks = tasks.filter(task_name=options['task_name'])
-        log.info('Cleaning up {} tasks'.format(tasks.count()))
+        log.info('Cleaning up {} tasks'.format(tasks.count()))  # pylint: disable=consider-using-f-string
         if options['dry_run']:
-            log.info("Tasks to clean up:\n{}".format(
-                '\n '.join('{!r}, resolved {}'.format(task, task.datetime_resolved) for task in tasks)
+            log.info("Tasks to clean up:\n{}".format(  # pylint: disable=consider-using-f-string
+                '\n '.join('{!r}, resolved {}'.format(  # pylint: disable=consider-using-f-string
+                    task, task.datetime_resolved) for task in tasks
+                           )
             ))
         else:
             tasks.delete()

celery_utils/management/commands/reapply_tasks.py

@@ -36,8 +36,8 @@ def handle(self, *args, **options):
         tasks = FailedTask.objects.filter(datetime_resolved=None)
         if options['task_name'] is not None:
             tasks = tasks.filter(task_name=options['task_name'])
-        log.info('Reapplying {} tasks'.format(tasks.count()))
-        log.debug('Reapplied tasks: {}'.format(list(tasks)))
+        log.info('Reapplying {} tasks'.format(tasks.count()))  # pylint: disable=consider-using-f-string
+        log.debug('Reapplied tasks: {}'.format(list(tasks)))  # pylint: disable=consider-using-f-string
         seen_tasks = set()
         for task in tasks:
             if task.task_id in seen_tasks:

celery_utils/models.py

@@ -48,8 +48,8 @@ def reapply(self):
         Enqueue new celery task with the same arguments as the failed task.
         """
         if self.datetime_resolved is not None:
-            raise TypeError('Cannot reapply a resolved task: {}'.format(self))
-        log.info('Reapplying failed task: {}'.format(self))
+            raise TypeError(f'Cannot reapply a resolved task: {self}')
+        log.info('Reapplying failed task: {}'.format(self))  # pylint: disable=consider-using-f-string
         original_task = current_app.tasks[self.task_name]
         original_task.apply_async(
             self.args,
@@ -59,9 +59,6 @@ def reapply(self):
         )
 
     def __str__(self):
-        return 'FailedTask: {task_name}, args={args}, kwargs={kwargs} ({resolution})'.format(
-            task_name=self.task_name,
-            args=self.args,
-            kwargs=self.kwargs,
-            resolution='not resolved' if self.datetime_resolved is None else 'resolved'
-        )
+        return f"FailedTask: {self.task_name}, " \
+               f"args={self.args}, kwargs={self.kwargs} " \
+               f"({'not resolved' if self.datetime_resolved is None else 'resolved'})"

requirements/ci.txt

@@ -8,13 +8,13 @@ backports.entry-points-selectable==1.1.0
     # via virtualenv
 certifi==2021.5.30
     # via requests
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
     # via requests
 codecov==2.1.12
     # via -r requirements/ci.in
 coverage==5.5
     # via codecov
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
 filelock==3.0.12
     # via
@@ -40,13 +40,13 @@ six==1.16.0
     #   virtualenv
 toml==0.10.2
     # via tox
-tox==3.24.3
+tox==3.24.4
     # via
     #   -r requirements/ci.in
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-urllib3==1.26.6
+urllib3==1.26.7
     # via requests
-virtualenv==20.7.2
+virtualenv==20.8.0
     # via tox

requirements/dev.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-astroid==2.7.3
+astroid==2.8.0
     # via
     #   pylint
     #   pylint-celery
@@ -18,7 +18,7 @@ cffi==1.14.6
     # via cryptography
 chardet==4.0.0
     # via diff-cover
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
     # via requests
 click==7.1.2
     # via
@@ -35,9 +35,9 @@ colorama==0.4.4
     # via twine
 cryptography==3.4.8
     # via secretstorage
-diff-cover==6.3.5
+diff-cover==6.4.0
     # via -r requirements/dev.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
 django==2.2.24
     # via
@@ -96,15 +96,15 @@ pbr==5.6.0
     # via stevedore
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.3.0
     # via -r requirements/dev.in
 pkginfo==1.7.1
     # via twine
 platformdirs==2.3.0
     # via
     #   pylint
     #   virtualenv
-pluggy==0.13.1
+pluggy==1.0.0
     # via
     #   diff-cover
     #   tox
@@ -122,7 +122,7 @@ pygments==2.10.0
     # via
     #   diff-cover
     #   readme-renderer
-pylint==2.10.2
+pylint==2.11.1
     # via
     #   edx-lint
     #   pylint-celery
@@ -181,19 +181,23 @@ toml==0.10.2
     #   tox
 tomli==1.2.1
     # via pep517
-tox==3.24.3
+tox==3.24.4
     # via
     #   -r requirements/dev.in
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/dev.in
-tqdm==4.62.2
+tqdm==4.62.3
     # via twine
 twine==3.4.2
     # via -r requirements/dev.in
-urllib3==1.26.6
+typing-extensions==3.10.0.2
+    # via
+    #   astroid
+    #   pylint
+urllib3==1.26.7
     # via requests
-virtualenv==20.7.2
+virtualenv==20.8.0
     # via tox
 webencodings==0.5.1
     # via bleach

requirements/doc.txt

@@ -20,7 +20,7 @@ celery==5.0.4
     #   -r requirements/base.in
 certifi==2021.5.30
     # via requests
-charset-normalizer==2.0.5
+charset-normalizer==2.0.6
     # via requests
 click==7.1.2
     # via
@@ -127,7 +127,7 @@ sqlparse==0.4.2
     # via django
 stevedore==3.4.0
     # via doc8
-urllib3==1.26.6
+urllib3==1.26.7
     # via requests
 vine==5.0.0
     # via

requirements/pip.txt

@@ -10,5 +10,5 @@ wheel==0.37.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.2.4
     # via -r requirements/pip.in
-setuptools==58.0.4
+setuptools==58.1.0
     # via -r requirements/pip.in

requirements/quality.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-astroid==2.7.3
+astroid==2.8.0
     # via
     #   pylint
     #   pylint-celery
@@ -40,7 +40,7 @@ pycodestyle==2.7.0
     # via -r requirements/quality.in
 pydocstyle==3.0.0
     # via -r requirements/quality.in
-pylint==2.10.2
+pylint==2.11.1
     # via
     #   edx-lint
     #   pylint-celery
@@ -70,6 +70,10 @@ text-unidecode==1.3
     # via python-slugify
 toml==0.10.2
     # via pylint
+typing-extensions==3.10.0.2
+    # via
+    #   astroid
+    #   pylint
 wrapt==1.12.1
     # via astroid
 

tests/test_logged_task.py

@@ -37,7 +37,7 @@ def test_failure():
     assert result.status == 'FAILURE'
     assert mocklog.error.called
     log_message = mocklog.error.call_args[0][0]
-    assert '[{}] failed due to Traceback'.format(result.task_id) in log_message
+    assert f'[{result.task_id}] failed due to Traceback' in log_message
 
 
 def test_retry():
@@ -55,5 +55,5 @@ def test_retry():
         with mock.patch('celery_utils.logged_task.log') as mocklog:
             task.on_retry(exc, task_id, args, kwargs, einfo)
             logmessage = mocklog.warning.call_args[0][0]
-            assert '[{}]'.format(task_id) in logmessage
+            assert f'[{task_id}]' in logmessage
             assert einfo.traceback in logmessage