Skip to content

Commit 6150b03

Browse files
regisbjohanseto
authored andcommitted
fix: "Invalid type for parameter ContentType" error on js upload (openedx#25957)
We are affected by this issue: jazzband/django-pipeline#297 (comment) In particular, this occurs when trying to upload js assets to s3, such as with the Scorm xblock: overhangio/openedx-scorm-xblock#16 This issue is resolved by upgrading django-pipeline to 2.0.3+, as the fix was introduced here: jazzband/django-pipeline#715 (cherry picked from commit d89868b)
1 parent d16174c commit 6150b03

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

requirements/constraints.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ django-countries==5.5
2323
# Removes deprecated get_ip function, which we still use (ARCHBOM-1329 for unpinning)
2424
django-ipware<3.0.0
2525

26-
# 2.0.0 dropped support for Python 3.5
27-
django-pipeline<2.0.0
28-
2926
# django-storages version 1.9 drops support for boto storage backend.
3027
django-storages<1.9
3128

requirements/edx/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ django-multi-email-field==0.6.2 # via edx-enterprise
6868
django-mysql==3.9.0 # via -r requirements/edx/base.in
6969
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
7070
django-object-actions==3.0.1 # via edx-enterprise
71-
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
72-
django-pyfs==2.2 # via -r requirements/edx/base.in
71+
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
72+
django-pyfs==3.0 # via -r requirements/edx/base.in
7373
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
7474
django-ratelimit==3.0.1 # via -r requirements/edx/base.in
7575
django-require==1.0.11 # via -r requirements/edx/base.in

requirements/edx/development.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/testing.txt, edx-ente
7979
django-mysql==3.9.0 # via -r requirements/edx/testing.txt
8080
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
8181
django-object-actions==3.0.1 # via -r requirements/edx/testing.txt, edx-enterprise
82-
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
83-
django-pyfs==2.2 # via -r requirements/edx/testing.txt
82+
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
83+
django-pyfs==3.0 # via -r requirements/edx/testing.txt
8484
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
8585
django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt
8686
django-require==1.0.11 # via -r requirements/edx/testing.txt

requirements/edx/testing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/base.txt, edx-enterpr
7777
django-mysql==3.9.0 # via -r requirements/edx/base.txt
7878
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
7979
django-object-actions==3.0.1 # via -r requirements/edx/base.txt, edx-enterprise
80-
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
81-
django-pyfs==2.2 # via -r requirements/edx/base.txt
80+
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
81+
django-pyfs==3.0 # via -r requirements/edx/base.txt
8282
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
8383
django-ratelimit==3.0.1 # via -r requirements/edx/base.txt
8484
django-require==1.0.11 # via -r requirements/edx/base.txt

0 commit comments

Comments
 (0)