From 6150b03ccb286c84bc6fa8601fb304a045d0a936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 1 Feb 2021 15:08:54 +0100 Subject: [PATCH] fix: "Invalid type for parameter ContentType" error on js upload (#25957) We are affected by this issue: https://github.com/jazzband/django-pipeline/pull/297#issuecomment-264416094 In particular, this occurs when trying to upload js assets to s3, such as with the Scorm xblock: https://github.com/overhangio/openedx-scorm-xblock/issues/16 This issue is resolved by upgrading django-pipeline to 2.0.3+, as the fix was introduced here: https://github.com/jazzband/django-pipeline/pull/715 (cherry picked from commit d89868b56b74cc6088357c229eb9e2b9c0adbf69) --- requirements/constraints.txt | 3 --- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 32f69d4c8765..ca7917bab12a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,9 +23,6 @@ django-countries==5.5 # Removes deprecated get_ip function, which we still use (ARCHBOM-1329 for unpinning) django-ipware<3.0.0 -# 2.0.0 dropped support for Python 3.5 -django-pipeline<2.0.0 - # django-storages version 1.9 drops support for boto storage backend. django-storages<1.9 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cd2d20fa24b2..5dc60213c919 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -68,8 +68,8 @@ django-multi-email-field==0.6.2 # via edx-enterprise django-mysql==3.9.0 # via -r requirements/edx/base.in django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in django-object-actions==3.0.1 # via edx-enterprise -django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in -django-pyfs==2.2 # via -r requirements/edx/base.in +django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +django-pyfs==3.0 # via -r requirements/edx/base.in git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/github.in django-ratelimit==3.0.1 # via -r requirements/edx/base.in django-require==1.0.11 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index bb4365b6e08c..2aef94463575 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -79,8 +79,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/testing.txt, edx-ente django-mysql==3.9.0 # via -r requirements/edx/testing.txt django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-object-actions==3.0.1 # via -r requirements/edx/testing.txt, edx-enterprise -django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt -django-pyfs==2.2 # via -r requirements/edx/testing.txt +django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +django-pyfs==3.0 # via -r requirements/edx/testing.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/testing.txt django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt django-require==1.0.11 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 963d7ccfd67b..cb6b3865dc9a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -77,8 +77,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/base.txt, edx-enterpr django-mysql==3.9.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt django-object-actions==3.0.1 # via -r requirements/edx/base.txt, edx-enterprise -django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt -django-pyfs==2.2 # via -r requirements/edx/base.txt +django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +django-pyfs==3.0 # via -r requirements/edx/base.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/base.txt django-ratelimit==3.0.1 # via -r requirements/edx/base.txt django-require==1.0.11 # via -r requirements/edx/base.txt