Fixed #5564 -- Removed html5lib from setup.py (#5581)

django-cms · Aug 1, 2016 · eba0ebf · eba0ebf
1 parent 7326645
commit eba0ebf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -125,9 +125,27 @@
 - Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems
 
 
-=== 3.1.6 (unreleased) ===
+=== 3.1.8 (unreleased) ===
+
+- Removed html5lib from setup.py
+
+
+=== 3.1.7 (2016-04-27) ===
+
+- Fix packaging problem with the wheel distribution
+
+
+=== 3.1.6 (2016-04-26) ===
 
 - Fix cache settings
+- Fix user lookup for view restrictions/page permissions when using raw id field
+- Fixes an issue relating to uninstalling a namespaced application
+- Adds "Can change page" permission
+- Addresses security vulnerabilities in the `render_model` template tag that
+  could lead to escalation of privileges or other security issues.
+- Addresses a security vulnerability in the cms' usage of the messages framework
+- Fixes security vulnerabilities in custom FormFields that could lead to
+  escalation of privileges or other security issues.
 
 
 === 3.1.5 (2016-01-29) ===

diff --git a/docs/how_to/install.rst b/docs/how_to/install.rst
@@ -27,7 +27,6 @@ Requirements
 * `django-classy-tags`_ 0.6.2 or higher
 * `django-treebeard`_ 3.0 (for Django 1.6) or 4.0 (for Django 1.7 and up)
 * `django-sekizai`_ 0.8.2 or higher
-* `html5lib`_ 0.99 or 0.999
 * `djangocms-admin-style`_
 * An installed and working instance of one of the databases listed in the
   `Databases`_ section.
@@ -41,7 +40,6 @@ Requirements
 .. _django-classy-tags: https://github.com/ojii/django-classy-tags
 .. _django-treebeard: http://code.tabo.pe/django-treebeard/src
 .. _django-sekizai: https://github.com/ojii/django-sekizai
-.. _html5lib: https://github.com/html5lib/html5lib-python
 .. _djangocms-admin-style: https://github.com/divio/djangocms-admin-style
 
 Recommended
@@ -149,7 +147,6 @@ django CMS and its dependencies:
     django-sekizai==0.8.2
     django-classy-tags==0.6.2
     djangocms-admin-style==0.2.2
-    html5lib==0.999
     six==1.3.0
 
     # Optional, recommended packages

diff --git a/setup.py b/setup.py
@@ -29,7 +29,6 @@
 INSTALL_REQUIREMENTS = [
     'Django>=1.6.9,<1.10',
     'django-classy-tags>=0.7.2',
-    'html5lib>=0.90,!=0.9999,!=0.99999',
     'django-formtools>=1.0',
     'django-treebeard>=3.0',
     'django-sekizai>=0.7',

diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
@@ -2,7 +2,6 @@ coverage==3.7.1
 python-coveralls==2.5.0
 unittest-xml-reporting==1.11.0
 Pillow==3.0
-html5lib>0.99999
 django-treebeard==4.0
 argparse
 dj-database-url