Merge 38c19c0 into 308a466

zopefoundation · Nov 28, 2019 · 248b29e · 248b29e
2 parents 308a466 + 38c19c0
commit 248b29e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Products.CMFCore Changelog
 2.4.2 (unreleased)
 ------------------
 
+- resolve ``docutils`` dependency conflict with ``Zope``
+  (`#83 <https://github.com/zopefoundation/Products.CMFCore/issues/83>`_)
+
 
 2.4.1 (2019-11-27)
 ------------------

diff --git a/setup.py b/setup.py
@@ -60,8 +60,7 @@ def _package_doc(name):
       install_requires=[
           'setuptools',
           'Zope >= 4.0b8',
-          'docutils < 0.15; python_version < "3"',
-          'docutils;python_version >= "3"',
+          'docutils > 0.15',
           'five.localsitemanager',
           'Products.BTreeFolder2',
           'Products.GenericSetup >= 2.0b5',