Drop support for Celery < 5, Python < 3.6.

Author: clokep

celery_batches/__init__.py

@@ -92,10 +92,8 @@ def wot_api_real(urls):
         current_app.backend.mark_as_done(request.id, response)
 
 """
-from __future__ import absolute_import, unicode_literals
-
 from itertools import count
-import sys
+from queue import Empty, Queue
 
 from celery import signals, states
 from celery._state import _task_stack
@@ -107,20 +105,6 @@ def wot_api_real(urls):
 
 from kombu.utils.uuid import uuid
 
-# Celery 5 dropped support for five, handle those manually.
-PY3 = sys.version_info[0] >= 3
-
-if PY3:
-    from queue import Empty, Queue
-
-    # Py3 does not have buffer, only use this for isa checks.
-    class buffer_t(object):
-        """Python 3 does not have a buffer type."""
-
-else:
-    from Queue import Queue, Empty
-    buffer_t = buffer  # noqa
-
 
 __all__ = ['Batches']
 
@@ -271,15 +255,12 @@ def Strategy(self, task, app, consumer):
         timer = consumer.timer
         put_buffer = self._buffer.put
         flush_buffer = self._do_flush
-        body_can_be_buffer = consumer.pool.body_can_be_buffer
 
         def task_message_handler(message, body, ack, reject, callbacks, **kw):
             if body is None:
                 body, headers, decoded, utc = (
                     message.body, message.headers, False, True,
                 )
-                if not body_can_be_buffer:
-                    body = bytes(body) if isinstance(body, buffer_t) else body
             else:
                 body, headers, decoded, utc = proto1_to_proto2(message, body)
 

setup.py

@@ -23,17 +23,16 @@ def long_description():
     url='https://github.com/percipient/celery-batches',
     license='BSD',
     platforms=['any'],
-    install_requires=['celery>=4.0,<5.1'],
+    install_requires=['celery>=5.0,<5.1'],
+    python_requires=">=3.6,",
     classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: BSD License',
         'Topic :: System :: Distributed Computing',
         'Topic :: Software Development :: Object Brokering',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',

tox.ini

@@ -1,21 +1,11 @@
 [tox]
 envlist =
-    {2.7,pypy,3.5,3.6,pypy3}-celery{40,41,42}
-    # Celery 4.3 adds support for Python 3.7 and higher.
-    {pypy3,3.7,3.8}-celery{43,44,50,master}
+    {pypy3,3.6,3.7,3.8}-celery{50,master}
     flake8
 
 [testenv]
 deps=
     -r{toxinidir}/requirements/test.txt
-    celery40: celery>=4.0,<4.1
-    # Kombu 4.2.0 is incompatible with Celery 4.0.x. It is compatible with
-    # Celery 4.1.1 and 4.2.x.
-    celery40: kombu<4.2
-    celery41: celery>=4.1,<4.2
-    celery42: celery>=4.2,<4.3
-    celery43: celery>=4.3,<4.4
-    celery44: celery>=4.4,<4.5
     celery50: celery>=5.0,<5.1
     celerymaster: https://codeload.github.com/celery/celery/zip/master
 
@@ -26,11 +16,9 @@ commands =
     coverage run -m pytest
     coverage html
 basepython =
-    2.7: python2.7
     3.6: python3.6
     3.7: python3.7
     3.8: python3.8
-    pypy: pypy
     pypy3: pypy3
     flake8: python3.6
 usedevelop = True