Skip to content

Commit

Permalink
fix: Remove S3_COURSE_IMPORT_EXPORT_BUCKET
Browse files Browse the repository at this point in the history
In upstream openedx-platform, if COURSE_IMPORT_EXPORT_BUCKET is set,
COURSE_IMPORT_EXPORT_STORAGE will be set to ImportExportS3Storage
which is a subclass of S3BotoStorage
(https://github.com/edx/edx-platform/blob/master/cms/envs/production.py#L340).
S3BotoStorage will break for Python versions >= 3.4.4
(see boto/boto#3433).
Therefor we remove the COURSE_IMPORT_EXPORT_BUCKET parameter until
this is fixed in upstream edx-platform.
  • Loading branch information
foadlind committed Jan 12, 2022
1 parent b69552f commit 4468f48
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -31,7 +31,6 @@ Configuration
* `S3_USE_SSL` (default: `true`)
* `S3_STORAGE_BUCKET` (default: `"openedx"`)
* `S3_FILE_UPLOAD_BUCKET` (default: `"{{ S3_STORAGE_BUCKET }}"`)
* `S3_COURSE_IMPORT_EXPORT_BUCKET` (default: `"{{ S3_STORAGE_BUCKET }}"`)
* `S3_PROFILE_IMAGE_BUCKET` (default: `"{{ S3_STORAGE_BUCKET }}"`)
* `S3_GRADE_BUCKET` (default: `"{{ S3_STORAGE_BUCKET }}"`)
* `S3_ADDRESSING_STYLE` (default: `"virtual"`)
Expand Down
3 changes: 1 addition & 2 deletions tutors3/patches/cms-env
@@ -1,2 +1 @@
"FILE_UPLOAD_STORAGE_BUCKET_NAME": "{{ S3_FILE_UPLOAD_BUCKET }}",
"COURSE_IMPORT_EXPORT_BUCKET": "{{ S3_COURSE_IMPORT_EXPORT_BUCKET }}"
"FILE_UPLOAD_STORAGE_BUCKET_NAME": "{{ S3_FILE_UPLOAD_BUCKET }}"
3 changes: 1 addition & 2 deletions tutors3/patches/lms-env
@@ -1,2 +1 @@
"FILE_UPLOAD_STORAGE_BUCKET_NAME": "{{ S3_FILE_UPLOAD_BUCKET }}",
"COURSE_IMPORT_EXPORT_BUCKET": "{{ S3_COURSE_IMPORT_EXPORT_BUCKET }}"
"FILE_UPLOAD_STORAGE_BUCKET_NAME": "{{ S3_FILE_UPLOAD_BUCKET }}"
1 change: 0 additions & 1 deletion tutors3/plugin.py
Expand Up @@ -15,7 +15,6 @@
"USE_SSL": "True",
"STORAGE_BUCKET": "openedx",
"FILE_UPLOAD_BUCKET": "{{ S3_STORAGE_BUCKET }}",
"COURSE_IMPORT_EXPORT_BUCKET": "{{ S3_STORAGE_BUCKET }}",
"PROFILE_IMAGE_BUCKET": "{{ S3_STORAGE_BUCKET }}",
"GRADE_BUCKET": "{{ S3_STORAGE_BUCKET }}",
"PROFILE_IMAGE_CUSTOM_DOMAIN": "",
Expand Down

0 comments on commit 4468f48

Please sign in to comment.