diff --git a/README.rst b/README.rst index aa64c0f8e..39cad2c70 100644 --- a/README.rst +++ b/README.rst @@ -248,8 +248,6 @@ OpenSlides uses the following projects or parts of them: * `Beautiful Soup `_, License: MIT -* `Bleach `_, License: BSD - * `Bootstrap `_, License: Apache License v2.0 diff --git a/extras/win32-portable/licenses/bleach b/extras/win32-portable/licenses/bleach deleted file mode 100644 index b7079fa5a..000000000 --- a/extras/win32-portable/licenses/bleach +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2010, Mozilla Foundation -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of bleach nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index b786670ab..36cb18c2d 100755 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -48,9 +48,6 @@ SITE_PACKAGES = { "beautifulsoup4": { "copy": ["bs4"], }, - "bleach": { - "copy": ["bleach"], - }, "html5lib": { "copy": ["html5lib"], }, diff --git a/requirements_production.txt b/requirements_production.txt index a1fef9329..59771c424 100644 --- a/requirements_production.txt +++ b/requirements_production.txt @@ -1,7 +1,6 @@ # Requirements for OpenSlides in production in alphabetical order Django>=1.7.1,<1.9 beautifulsoup4>=4.1,<4.5 -bleach>=1.4,<1.5 django-haystack>=2.1,<2.5 djangorestframework>=3.2.0,<3.3.0 jsonfield>=0.9.19,<1.1