Merge pull request #171 from openedx/feanil/update_bleach

feanil/update bleach

requirements/base.in

@@ -1,7 +1,7 @@
 # Core requirements for using this package
 -c constraints.txt
 
-bleach[css]			# Use for sanitizing HTML content in wiki articles
+bleach[css]>=6.0.0	# Use for sanitizing HTML content in wiki articles
 django
 django-mptt
 django-sekizai

requirements/base.txt

@@ -1,47 +1,47 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.6.0
     # via django
-bleach[css]==5.0.1
+bleach[css]==6.0.0
     # via -r requirements/base.in
-django==3.2.15
+django==3.2.16
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
     #   django-classy-tags
     #   django-js-asset
     #   django-sekizai
-django-classy-tags==3.0.1
+django-classy-tags==4.0.0
     # via django-sekizai
 django-js-asset==2.0.0
     # via django-mptt
-django-mptt==0.13.4
+django-mptt==0.14.0
     # via -r requirements/base.in
 django-sekizai==4.0.0
     # via -r requirements/base.in
-importlib-metadata==4.12.0
+importlib-metadata==6.0.0
     # via markdown
 markdown==3.3.7
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-pytz==2022.2.1
+pytz==2022.7.1
     # via django
 six==1.16.0
     # via bleach
 sorl-thumbnail==12.9.0
     # via -r requirements/base.in
-sqlparse==0.4.2
+sqlparse==0.4.3
     # via django
 tinycss2==1.1.1
     # via bleach
 webencodings==0.5.1
     # via
     #   bleach
     #   tinycss2
-zipp==3.8.1
+zipp==3.12.0
     # via importlib-metadata

requirements/ci.txt

@@ -1,23 +1,23 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
 distlib==0.3.6
     # via
     #   -r requirements/tox.txt
     #   virtualenv
-filelock==3.8.0
+filelock==3.9.0
     # via
     #   -r requirements/tox.txt
     #   tox
     #   virtualenv
-packaging==21.3
+packaging==23.0
     # via
     #   -r requirements/tox.txt
     #   tox
-platformdirs==2.5.2
+platformdirs==2.6.2
     # via
     #   -r requirements/tox.txt
     #   virtualenv
@@ -29,10 +29,6 @@ py==1.11.0
     # via
     #   -r requirements/tox.txt
     #   tox
-pyparsing==3.0.9
-    # via
-    #   -r requirements/tox.txt
-    #   packaging
 six==1.16.0
     # via
     #   -r requirements/tox.txt
@@ -41,9 +37,11 @@ tomli==2.0.1
     # via
     #   -r requirements/tox.txt
     #   tox
-tox==3.26.0
-    # via -r requirements/tox.txt
-virtualenv==20.16.5
+tox==3.28.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/tox.txt
+virtualenv==20.17.1
     # via
     #   -r requirements/tox.txt
     #   tox

requirements/django.txt

@@ -1 +1 @@
-django==3.2.15
+django==3.2.16

requirements/docs.txt

@@ -1,50 +1,49 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
-alabaster==0.7.12
+alabaster==0.7.13
     # via sphinx
-babel==2.10.3
+babel==2.11.0
     # via sphinx
-certifi==2022.6.15.1
+certifi==2022.12.7
     # via requests
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 docutils==0.19
     # via sphinx
-edx-sphinx-theme==3.0.0
+edx-sphinx-theme==3.1.0
     # via -r requirements/docs.in
-idna==3.3
+idna==3.4
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==4.12.0
+importlib-metadata==6.0.0
     # via sphinx
 jinja2==3.1.2
     # via sphinx
-markupsafe==2.1.1
+markupsafe==2.1.2
     # via jinja2
-packaging==21.3
+packaging==23.0
     # via sphinx
-pygments==2.13.0
+pygments==2.14.0
     # via sphinx
-pyparsing==3.0.9
-    # via packaging
-pytz==2022.2.1
+pytz==2022.7.1
     # via babel
-requests==2.28.1
+requests==2.28.2
     # via sphinx
 six==1.16.0
     # via edx-sphinx-theme
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==5.1.1
+sphinx==5.3.0
     # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/docs.in
     #   edx-sphinx-theme
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==1.0.4
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
@@ -56,7 +55,7 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.12
+urllib3==1.26.14
     # via requests
-zipp==3.8.1
+zipp==3.12.0
     # via importlib-metadata

requirements/pip.txt

@@ -4,13 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.37.1
+wheel==0.38.4
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.2.2
+pip==23.0
+    # via -r requirements/pip.in
+setuptools==67.0.0
     # via -r requirements/pip.in
-setuptools==59.8.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   -r requirements/pip.in

requirements/pip_tools.txt

@@ -4,23 +4,19 @@
 #
 #    make upgrade
 #
-build==0.8.0
+build==0.10.0
     # via pip-tools
 click==8.1.3
     # via pip-tools
-packaging==21.3
+packaging==23.0
     # via build
-pep517==0.13.0
-    # via build
-pip-tools==6.8.0
+pip-tools==6.12.2
     # via -r requirements/pip_tools.in
-pyparsing==3.0.9
-    # via packaging
+pyproject-hooks==1.0.0
+    # via build
 tomli==2.0.1
-    # via
-    #   build
-    #   pep517
-wheel==0.37.1
+    # via build
+wheel==0.38.4
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/test.txt

@@ -1,65 +1,63 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
-asgiref==3.5.2
+asgiref==3.6.0
     # via
     #   -r requirements/base.txt
     #   django
-attrs==22.1.0
+attrs==22.2.0
     # via pytest
-bleach[css]==5.0.1
+bleach[css]==6.0.0
     # via -r requirements/base.txt
-coverage[toml]==6.4.4
+coverage[toml]==7.1.0
     # via pytest-cov
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.txt
     #   django-classy-tags
     #   django-js-asset
     #   django-sekizai
-django-classy-tags==3.0.1
+django-classy-tags==4.0.0
     # via
     #   -r requirements/base.txt
     #   django-sekizai
 django-js-asset==2.0.0
     # via
     #   -r requirements/base.txt
     #   django-mptt
-django-mptt==0.13.4
+django-mptt==0.14.0
     # via -r requirements/base.txt
 django-sekizai==4.0.0
     # via -r requirements/base.txt
-importlib-metadata==4.12.0
+exceptiongroup==1.1.0
+    # via pytest
+importlib-metadata==6.0.0
     # via
     #   -r requirements/base.txt
     #   markdown
-iniconfig==1.1.1
+iniconfig==2.0.0
     # via pytest
 markdown==3.3.7
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
-packaging==21.3
+packaging==23.0
     # via pytest
 pluggy==1.0.0
     # via pytest
-py==1.11.0
-    # via pytest
-pyparsing==3.0.9
-    # via packaging
-pytest==7.1.3
+pytest==7.2.1
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   pytest-django
-pytest-cov==3.0.0
+pytest-cov==4.0.0
     # via -r requirements/test.in
 pytest-django==4.5.2
     # via -r requirements/test.in
-pytz==2022.2.1
+pytz==2022.7.1
     # via
     #   -r requirements/base.txt
     #   django
@@ -69,7 +67,7 @@ six==1.16.0
     #   bleach
 sorl-thumbnail==12.9.0
     # via -r requirements/base.txt
-sqlparse==0.4.2
+sqlparse==0.4.3
     # via
     #   -r requirements/base.txt
     #   django
@@ -78,15 +76,13 @@ tinycss2==1.1.1
     #   -r requirements/base.txt
     #   bleach
 tomli==2.0.1
-    # via
-    #   coverage
-    #   pytest
+    # via pytest
 webencodings==0.5.1
     # via
     #   -r requirements/base.txt
     #   bleach
     #   tinycss2
-zipp==3.8.1
+zipp==3.12.0
     # via
     #   -r requirements/base.txt
     #   importlib-metadata