Bläddra i källkod

5.0 depends on Python 3.6

Ask Solem 8 år sedan
förälder
incheckning
880813dce6
4 ändrade filer med 18 tillägg och 23 borttagningar
  1. 2 3
      README.rst
  2. 5 6
      docs/getting-started/introduction.rst
  3. 2 3
      docs/includes/introduction.txt
  4. 9 11
      setup.py

+ 2 - 3
README.rst

@@ -46,10 +46,9 @@ by `using webhooks`_.
 What do I need?
 What do I need?
 ===============
 ===============
 
 
-Celery version 4.0 runs on,
+Celery version 5.0 runs on,
 
 
-- Python (2.7, 3.4, 3.5)
-- PyPy (5.1, 2.4)
+- Python (3.6)
 
 
 
 
 This is the last version to support Python 2.7,
 This is the last version to support Python 2.7,

+ 5 - 6
docs/getting-started/introduction.rst

@@ -38,17 +38,16 @@ What do I need?
 ===============
 ===============
 
 
 .. sidebar:: Version Requirements
 .. sidebar:: Version Requirements
-    :subtitle: Celery version 4.0 runs on
+    :subtitle: Celery version 5.0 runs on
 
 
-    - Python ❨2.7, 3.4, 3.5❩
-    - PyPy ❨5.1, 2.4❩
-
-    This is the last version to support Python 2.7,
-    and from the next version (Celery 5.x) Python 3.6 or newer is required.
+    - Python ❨3.6❩
 
 
     If you are running an older version of Python, you need to be running
     If you are running an older version of Python, you need to be running
     an older version of Celery:
     an older version of Celery:
 
 
+    - Python 3.5: Celery series 4.0 or ealirer.
+    - Python 3.4: Celery series 4.0 or earlier.
+    - Python 2.7: Celery series 4.0 or earlier.
     - Python 2.6: Celery series 3.1 or earlier.
     - Python 2.6: Celery series 3.1 or earlier.
     - Python 2.5: Celery series 3.0 or earlier.
     - Python 2.5: Celery series 3.0 or earlier.
     - Python 2.4 was Celery series 2.2 or earlier.
     - Python 2.4 was Celery series 2.2 or earlier.

+ 2 - 3
docs/includes/introduction.txt

@@ -38,10 +38,9 @@ by `using webhooks`_.
 What do I need?
 What do I need?
 ===============
 ===============
 
 
-Celery version 4.0 runs on,
+Celery version 5.0 runs on,
 
 
-- Python (2.7, 3.4, 3.5)
-- PyPy (5.1, 2.4)
+- Python (3.6)
 
 
 
 
 This is the last version to support Python 2.7,
 This is the last version to support Python 2.7,

+ 9 - 11
setup.py

@@ -17,9 +17,13 @@ except (AttributeError, ImportError):
 
 
 E_UNSUPPORTED_PYTHON = """
 E_UNSUPPORTED_PYTHON = """
 ----------------------------------------
 ----------------------------------------
- Celery 4.0 requires %s %s or later!
+ Celery 5.0 requires %s %s or later!
 ----------------------------------------
 ----------------------------------------
 
 
+- For CPython 2.7, PyPy 2.x, Jython 2.7, CPython 3.4->3.5; use Celery 4.0:
+
+    $ pip install 'celery>3,<5'
+
 - For CPython 2.6, PyPy 1.x, Jython 2.6, CPython 3.2->3.3; use Celery 3.1:
 - For CPython 2.6, PyPy 1.x, Jython 2.6, CPython 3.2->3.3; use Celery 3.1:
 
 
     $ pip install 'celery<4'
     $ pip install 'celery<4'
@@ -34,18 +38,15 @@ E_UNSUPPORTED_PYTHON = """
 """
 """
 
 
 PYIMP = _pyimp()
 PYIMP = _pyimp()
-PY26_OR_LESS = sys.version_info < (2, 7)
 PY3 = sys.version_info[0] == 3
 PY3 = sys.version_info[0] == 3
-PY33_OR_LESS = PY3 and sys.version_info < (3, 4)
+PY35_OR_LESS = PY3 and sys.version_info < (3, 6)
 JYTHON = sys.platform.startswith('java')
 JYTHON = sys.platform.startswith('java')
 PYPY_VERSION = getattr(sys, 'pypy_version_info', None)
 PYPY_VERSION = getattr(sys, 'pypy_version_info', None)
 PYPY = PYPY_VERSION is not None
 PYPY = PYPY_VERSION is not None
 PYPY24_ATLEAST = PYPY_VERSION and PYPY_VERSION >= (2, 4)
 PYPY24_ATLEAST = PYPY_VERSION and PYPY_VERSION >= (2, 4)
 
 
-if PY26_OR_LESS:
-    raise Exception(E_UNSUPPORTED_PYTHON % (PYIMP, '2.7'))
-elif PY33_OR_LESS and not PYPY24_ATLEAST:
-    raise Exception(E_UNSUPPORTED_PYTHON % (PYIMP, '3.4'))
+if PY35_OR_LESS:
+    raise Exception(E_UNSUPPORTED_PYTHON % (PYIMP, '3.6'))
 
 
 # -*- Upgrading from older versions -*-
 # -*- Upgrading from older versions -*-
 
 
@@ -92,11 +93,8 @@ classes = """
     Topic :: System :: Distributed Computing
     Topic :: System :: Distributed Computing
     Topic :: Software Development :: Object Brokering
     Topic :: Software Development :: Object Brokering
     Programming Language :: Python
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Programming Language :: Python :: Implementation :: PyPy
     Operating System :: OS Independent
     Operating System :: OS Independent