From 15251640a97d19c2839b13ebcd25a4559d4d8df8 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@tcril.org>
Date: Tue, 29 Nov 2022 10:45:48 -0500
Subject: [PATCH 1/2] fix: Explicitly ask for the `css` extra package.

Based on https://github.com/openedx/edx-platform/pull/31360/files#r1033984433
it looks like compile-requirements runs differently on different OSes
potentially.  But we need this because it's used by the CSSSanitizer in
capa (xmodule/capa/util.py).
---
 requirements/edx/base.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 10444d67f911..b36dcb9eb580 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -28,7 +28,7 @@ acid-xblock
 analytics-python                    # Used for Segment analytics
 attrs                               # Reduces boilerplate code involving class attributes
 Babel                               # Internationalization utilities, used for date formatting in a few places
-bleach                              # Allowed-list-based HTML sanitizing library that escapes or strips markup and attributes; used for capa and LTI
+bleach[css]                         # Allowed-list-based HTML sanitizing library that escapes or strips markup and attributes; used for capa and LTI
 boto==2.39.0                        # Deprecated version of the AWS SDK; we should stop using this
 boto3==1.4.8                        # Amazon Web Services SDK for Python
 botocore==1.8.17                    # via boto3, s3transfer
@@ -179,4 +179,4 @@ xss-utils                           # https://github.com/edx/edx-platform/pull/2
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.
 xblock-drag-and-drop-v2             # Drag and Drop XBlock
 xblock-google-drive                 # XBlock for google docs and calendar
-openedx-django-wiki 
+openedx-django-wiki

From 8ccf2a3b88d7cd64785e0776f39ffda1f95d68f1 Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@tcril.org>
Date: Tue, 29 Nov 2022 10:49:02 -0500
Subject: [PATCH 2/2] chore: Run `compile requirements`

---
 requirements/edx/base.txt        | 5 ++++-
 requirements/edx/development.txt | 7 ++++++-
 requirements/edx/pip.txt         | 2 +-
 requirements/edx/testing.txt     | 7 ++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index f0843c6ea212..eb1320ff3d5b 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -56,7 +56,7 @@ beautifulsoup4==4.11.1
     # via pynliner
 billiard==3.6.4.0
     # via celery
-bleach==5.0.1
+bleach[css]==5.0.1
     # via
     #   -r requirements/edx/base.in
     #   edx-enterprise
@@ -1103,6 +1103,8 @@ testfixtures==7.0.2
     # via edx-enterprise
 text-unidecode==1.3
     # via python-slugify
+tinycss2==1.1.1
+    # via bleach
 tqdm==4.64.1
     # via nltk
 typing-extensions==4.4.0
@@ -1151,6 +1153,7 @@ webencodings==0.5.1
     # via
     #   bleach
     #   html5lib
+    #   tinycss2
 webob==1.8.7
     # via
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 9ee443f7aa7f..e57cb420149a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -91,7 +91,7 @@ billiard==3.6.4.0
     # via
     #   -r requirements/edx/testing.txt
     #   celery
-bleach==5.0.1
+bleach[css]==5.0.1
     # via
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
@@ -1541,6 +1541,10 @@ text-unidecode==1.3
     # via
     #   -r requirements/edx/testing.txt
     #   python-slugify
+tinycss2==1.1.1
+    # via
+    #   -r requirements/edx/testing.txt
+    #   bleach
 toml==0.10.2
     # via vulture
 tomli==2.0.1
@@ -1641,6 +1645,7 @@ webencodings==0.5.1
     #   -r requirements/edx/testing.txt
     #   bleach
     #   html5lib
+    #   tinycss2
 webob==1.8.7
     # via
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt
index fce157f653c9..bcce651bbe8e 100644
--- a/requirements/edx/pip.txt
+++ b/requirements/edx/pip.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-wheel==0.38.3
+wheel==0.38.4
     # via -r requirements/edx/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 2dd30a397642..0e8053953a65 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -86,7 +86,7 @@ billiard==3.6.4.0
     # via
     #   -r requirements/edx/base.txt
     #   celery
-bleach==5.0.1
+bleach[css]==5.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1437,6 +1437,10 @@ text-unidecode==1.3
     # via
     #   -r requirements/edx/base.txt
     #   python-slugify
+tinycss2==1.1.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   bleach
 tomli==2.0.1
     # via
     #   coverage
@@ -1521,6 +1525,7 @@ webencodings==0.5.1
     #   -r requirements/edx/base.txt
     #   bleach
     #   html5lib
+    #   tinycss2
 webob==1.8.7
     # via
     #   -r requirements/edx/base.txt