Merge branch 'master' into cli-refactor

celery/backends/database/__init__.py

@@ -8,6 +8,7 @@
 from celery.backends.base import BaseBackend
 from celery.exceptions import ImproperlyConfigured
 from celery.utils.time import maybe_timedelta
+
 from .models import Task, TaskExtended, TaskSet
 from .session import SessionManager
 

celery/backends/redis.py

@@ -17,6 +17,7 @@
 from celery.utils.functional import dictfilter
 from celery.utils.log import get_logger
 from celery.utils.time import humanize_seconds
+
 from .asynchronous import AsyncBackendMixin, BaseResultConsumer
 from .base import BaseKeyValueStoreBackend
 

celery/utils/encoding.py

@@ -1,5 +1,5 @@
 """**DEPRECATED**: This module has moved to :mod:`kombu.utils.encoding`."""
-from kombu.utils.encoding import (bytes_to_str,  # noqa
-                                  default_encode, default_encoding,
+from kombu.utils.encoding import bytes_to_str  # noqa
+from kombu.utils.encoding import (default_encode, default_encoding,
                                   ensure_bytes, from_utf8, safe_repr,
                                   safe_str, str_to_bytes)

celery/utils/log.py

@@ -7,11 +7,12 @@
 import traceback
 from contextlib import contextmanager
 
-from celery.five import values
 from kombu.log import LOG_LEVELS
 from kombu.log import get_logger as _get_logger
 from kombu.utils.encoding import safe_str
 
+from celery.five import values
+
 from .term import colored
 
 __all__ = (

docs/conf.py

@@ -3,8 +3,8 @@
 globals().update(conf.build_config(
     'celery', __file__,
     project='Celery',
-    version_dev='5.0',
-    version_stable='4.0',
+    version_dev='6.0',
+    version_stable='5.0',
     canonical_url='http://docs.celeryproject.org',
     webdomain='celeryproject.org',
     github_project='celery/celery',