Merge remote-tracking branch 'upstream/develop' into develop

devketanpro · Nov 14, 2024 · d6817f7 · d6817f7
2 parents 0614592 + 5313fbc
commit d6817f7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/content_api/assets/__init__.py b/content_api/assets/__init__.py
@@ -26,8 +26,10 @@ def get_media_streamed(media_id):
     if not app.auth.authorized([], "assets", "GET"):
         return app.auth.authenticate()
     try:
-        media_id = media_id.split(".")[0]
         media_file = app.media.get(media_id, "upload")
+        if not media_file:
+            media_id = media_id.split(".")[0]
+            media_file = app.media.get(media_id, "upload")
     except bson.errors.InvalidId:
         media_file = None
     if media_file:

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -13,7 +13,7 @@ pytest
 pytest-env
 python3-saml>=1.9,<1.17
 typing_extensions>=3.7.4
-moto[sqs]==5.0.16
+moto[sqs]==5.0.18
 pyexiv2>=2.12.0,<2.13; sys_platform == 'linux'
 
 -e .

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -22,7 +22,7 @@ colorama==0.4.6
     # via sphinx-autobuild
 docutils==0.19
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx
 exceptiongroup==1.2.1
     # via anyio
@@ -36,11 +36,11 @@ imagesize==1.4.1
     # via sphinx
 jinja2==2.11.3
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx
 markupsafe==2.0.1
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   jinja2
 packaging==24.1
     # via sphinx
@@ -54,11 +54,11 @@ snowballstemmer==2.2.0
     # via sphinx
 sphinx==5.1.1
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx-autobuild
     #   sphinxcontrib-plantuml
 sphinx-autobuild==2024.10.3
-    # via -r requirements.in
+    # via -r docs/requirements.in
 sphinxcontrib-applehelp==1.0.8
     # via sphinx
 sphinxcontrib-devhelp==1.0.6
@@ -68,7 +68,7 @@ sphinxcontrib-htmlhelp==2.0.5
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-plantuml==0.30
-    # via -r requirements.in
+    # via -r docs/requirements.in
 sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
@@ -85,5 +85,5 @@ uvicorn==0.30.1
     # via sphinx-autobuild
 watchfiles==0.22.0
     # via sphinx-autobuild
-websockets==12.0
+websockets==13.1
     # via sphinx-autobuild
diff --git a/mypy-requirements.txt b/mypy-requirements.txt
@@ -11,7 +11,7 @@ types-python-dateutil
 types-pytz
 types-PyYAML
 types-redis
-types-requests<2.32.0.20240915  # https://github.com/python/typeshed/issues/10825
+types-requests<2.32.0.20241017  # https://github.com/python/typeshed/issues/10825
 types-tzlocal
 types-Werkzeug
 types-jwt

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
     "websockets>=10.3,<13.2",
     "PyYAML>=6.0.1",
     "lxml>=5.2.2,<5.3",
-    "lxml_html_clean>=0.1.1,<0.3",
+    "lxml_html_clean>=0.1.1,<0.4",
     "python-twitter>=3.5,<3.6",
     "chardet<6.0",
     "pymongo>=3.8,<3.12",