From e0f2794ce3ad6eacb9968e776b286da92ef05d41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:53:28 -0500 Subject: [PATCH 01/11] Bump django-db-file-storage from 0.5.5 to 0.5.6.1 (#312) Bumps [django-db-file-storage](https://github.com/victor-o-silva/db_file_storage) from 0.5.5 to 0.5.6.1. - [Release notes](https://github.com/victor-o-silva/db_file_storage/releases) - [Changelog](https://github.com/Aagam41/db_file_storage/blob/master/CHANGES.txt) - [Commits](https://github.com/victor-o-silva/db_file_storage/commits) --- updated-dependencies: - dependency-name: django-db-file-storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5f5f0b9..f8b3f8b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ mysqlclient==2.1.1 # Django and related Django==4.2.16 django-csp==3.7 # For Content Security Policy -django-db-file-storage==0.5.5 # Support for storage in the database +django-db-file-storage==0.5.6.1 # Support for storage in the database django-mysql==4.15.0 django-tinymce==4.1.0 # Rich text editor django-watchman==1.3 From 4f4ce50840c1b109dc38de3a842cb47cb334eb9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:02:36 -0500 Subject: [PATCH 02/11] Bump canvasapi from 2.2.0 to 3.3.0 (#310) Bumps [canvasapi](https://github.com/ucfopen/canvasapi) from 2.2.0 to 3.3.0. - [Release notes](https://github.com/ucfopen/canvasapi/releases) - [Changelog](https://github.com/ucfopen/canvasapi/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ucfopen/canvasapi/compare/v2.2.0...v3.3.0) --- updated-dependencies: - dependency-name: canvasapi dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f8b3f8b..a97d260 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ pycryptodome==3.19.1 # For generating LTI keys PyLTI1p3==1.12.1 # Canvas -canvasapi==2.2.0 +canvasapi==3.3.0 # Not in pypi https://github.com/Harvard-University-iCommons/django-canvas-oauth https://github.com/Harvard-University-iCommons/django-canvas-oauth/archive/v1.1.0.tar.gz From a1370d897b9d9462c264fb53566df0060266c3f0 Mon Sep 17 00:00:00 2001 From: Pushyami Gundala Date: Fri, 8 Nov 2024 11:11:08 -0500 Subject: [PATCH 03/11] #320 upgrading to python 3.10 and Canvas Oauth pkg (#321) --- docker-compose.yml | 2 -- dockerfiles/Dockerfile | 2 +- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f262d51..e79b799 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: mysql: image: mysql:8-oracle diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 48c19b2..6263121 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,7 +1,7 @@ # FROM directive instructing base image to build upon # This could be used as a base instead: # https://hub.docker.com/r/nikolaik/python-nodejs -FROM python:3.8-slim +FROM python:3.10-slim-bookworm # NOTE: requirements.txt not likely to change between dev builds COPY requirements.txt . diff --git a/requirements.txt b/requirements.txt index a97d260..2249566 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,4 +26,4 @@ PyLTI1p3==1.12.1 canvasapi==3.3.0 # Not in pypi https://github.com/Harvard-University-iCommons/django-canvas-oauth -https://github.com/Harvard-University-iCommons/django-canvas-oauth/archive/v1.1.0.tar.gz +https://github.com/Harvard-University-iCommons/django-canvas-oauth/archive/v1.1.1.tar.gz From ba52d700a4ec23e4e9c56586e35b53c465fe12c2 Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Fri, 8 Nov 2024 11:45:10 -0500 Subject: [PATCH 04/11] Configuring to ignore non LTS versions (#319) * Configuring to ignore non LTS versions 5.2 LTS isn't released until later in 2025 so going to see if it keeps it back to 4.2 releases * Update dependabot.yml --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a87dde2..4f9ea01 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,12 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" + allow: + - dependency-type: "direct" + ignore: + - dependency-name: "django" + versions: + - "> 4.2" # This ignores versions above 4.2, allowing only 4.2.x LTS upgrades # Maintain dependencies for npm - package-ecosystem: "npm" directory: "/frontend" From aa4aec72b8916c8ce94859a759c676d36511bf9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:25:44 -0500 Subject: [PATCH 05/11] Bump pylti1p3 from 1.12.1 to 2.0.0 (#326) Bumps [pylti1p3](https://github.com/dmitry-viskov/pylti1.3) from 1.12.1 to 2.0.0. - [Release notes](https://github.com/dmitry-viskov/pylti1.3/releases) - [Commits](https://github.com/dmitry-viskov/pylti1.3/compare/1.12.1...2.0.0) --- updated-dependencies: - dependency-name: pylti1p3 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2249566..6f576d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ markdown==3.4.1 # Markdown support for the browsable API # LTI pycryptodome==3.19.1 # For generating LTI keys -PyLTI1p3==1.12.1 +PyLTI1p3==2.0.0 # Canvas canvasapi==3.3.0 From aab0e5f2772b710ba8a21eac54e09ad4a22dcccf Mon Sep 17 00:00:00 2001 From: Pushyami Gundala Date: Fri, 8 Nov 2024 16:01:22 -0500 Subject: [PATCH 06/11] #333 supporting local debugging (#334) * #333 supporting local debugging --- .vscode/launch.json | 22 ++++++++++++++++++++++ backend/debugpy.py | 15 +++++++++++++++ backend/wsgi.py | 4 ++++ docker-compose.yml | 1 + requirements.txt | 2 ++ 5 files changed, 44 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 backend/debugpy.py diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..c0cfa93 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + "version": "0.2.0", + "configurations": [ + + { + "name": "IPT Django", + "type": "debugpy", + "request": "attach", + "pathMappings": [ + { + "localRoot": "${workspaceFolder}", + "remoteRoot": "/code" + } + ], + "connect": { + "port": 5020, + "host": "localhost", + }, + "justMyCode": false + } + ] +} \ No newline at end of file diff --git a/backend/debugpy.py b/backend/debugpy.py new file mode 100644 index 0000000..2b1435b --- /dev/null +++ b/backend/debugpy.py @@ -0,0 +1,15 @@ +import os +import debugpy +import logging + +def config_to_bool(value): + return str(value).lower() in ('true', '1', 'yes', 'on') + +def check_and_enable_debugpy(): + debugpy_enable = config_to_bool(os.getenv('DEBUGPY_ENABLE', False)) + debugpy_address = '0.0.0.0' + debugpy_port = 5020 + + if debugpy_enable: + logging.debug('DEBUGPY: Enabled Listening on ({0}:{1})'.format(debugpy_address, debugpy_port)) + debugpy.listen((debugpy_address, debugpy_port)) \ No newline at end of file diff --git a/backend/wsgi.py b/backend/wsgi.py index c3a803c..eca573b 100644 --- a/backend/wsgi.py +++ b/backend/wsgi.py @@ -11,6 +11,10 @@ from django.core.wsgi import get_wsgi_application +from backend.debugpy import check_and_enable_debugpy + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings') +check_and_enable_debugpy() + application = get_wsgi_application() diff --git a/docker-compose.yml b/docker-compose.yml index e79b799..1341b78 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: - ${HOME}/mylasecrets:/secrets ports: - "5000:5000" + - "5020:5020" container_name: canvas_app_explorer env_file: - .env diff --git a/requirements.txt b/requirements.txt index 6f576d0..9f9730e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,7 @@ PyLTI1p3==2.0.0 # Canvas canvasapi==3.3.0 +debugpy==1.8.8 + # Not in pypi https://github.com/Harvard-University-iCommons/django-canvas-oauth https://github.com/Harvard-University-iCommons/django-canvas-oauth/archive/v1.1.1.tar.gz From 51118ae45546a7fc5e4a3529b057286395f16190 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:11:16 -0500 Subject: [PATCH 07/11] Bump gunicorn from 22.0.0 to 23.0.0 (#323) Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 22.0.0 to 23.0.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pushyami Gundala --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9f9730e..0bcaee5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -gunicorn==22.0.0 +gunicorn==23.0.0 mysqlclient==2.1.1 # Django and related From c026c7dee04be284c4e260441585bb488f291634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:17:24 -0500 Subject: [PATCH 08/11] Bump pycryptodome from 3.19.1 to 3.21.0 (#325) Bumps [pycryptodome](https://github.com/Legrandin/pycryptodome) from 3.19.1 to 3.21.0. ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pushyami Gundala --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0bcaee5..c5567cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ drf-spectacular==0.22.1 markdown==3.4.1 # Markdown support for the browsable API # LTI -pycryptodome==3.19.1 # For generating LTI keys +pycryptodome==3.21.0 # For generating LTI keys PyLTI1p3==2.0.0 # Canvas From d65abbf13b7a2bae6fafb78f9b6cbcf6d0e5e978 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:19:48 -0500 Subject: [PATCH 09/11] Bump django-filter from 22.1 to 24.3 (#327) Bumps [django-filter](https://github.com/carltongibson/django-filter) from 22.1 to 24.3. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pushyami Gundala --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5567cb..13541a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ whitenoise==6.2.0 # For serving static files # DRF djangorestframework==3.15.2 -django-filter==22.1 # Filtering support +django-filter==24.3 # Filtering support drf-spectacular==0.22.1 markdown==3.4.1 # Markdown support for the browsable API From 375f4758788643dc9bbf2cc14033292bcd2220cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:26:00 -0500 Subject: [PATCH 10/11] Bump pillow from 10.3.0 to 11.0.0 (#329) Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.3.0 to 11.0.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pushyami Gundala --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 13541a0..4375368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-mysql==4.15.0 django-tinymce==4.1.0 # Rich text editor django-watchman==1.3 django-webpack-loader==1.6.0 -Pillow==10.3.0 +Pillow==11.0.0 whitenoise==6.2.0 # For serving static files # DRF From 642ca1a53adb1fefe839d9fb6d8934eb8d160709 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:15:29 -0500 Subject: [PATCH 11/11] Bump mini-css-extract-plugin from 2.6.1 to 2.9.2 in /frontend (#313) Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.6.1 to 2.9.2. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pushyami Gundala --- frontend/package-lock.json | 20 +++++++++++--------- frontend/package.json | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 39c1f57..d06801e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -28,7 +28,7 @@ "eslint": "^8.20.0", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", - "mini-css-extract-plugin": "^2.6.1", + "mini-css-extract-plugin": "^2.9.2", "ts-loader": "^9.3.1", "ts-node": "^10.9.1", "typescript": "^4.7.4", @@ -3398,12 +3398,13 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz", - "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz", + "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==", "dev": true, "dependencies": { - "schema-utils": "^4.0.0" + "schema-utils": "^4.0.0", + "tapable": "^2.2.1" }, "engines": { "node": ">= 12.13.0" @@ -7514,12 +7515,13 @@ } }, "mini-css-extract-plugin": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz", - "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz", + "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==", "dev": true, "requires": { - "schema-utils": "^4.0.0" + "schema-utils": "^4.0.0", + "tapable": "^2.2.1" }, "dependencies": { "ajv": { diff --git a/frontend/package.json b/frontend/package.json index 1889099..36e00a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "eslint": "^8.20.0", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", - "mini-css-extract-plugin": "^2.6.1", + "mini-css-extract-plugin": "^2.9.2", "ts-loader": "^9.3.1", "ts-node": "^10.9.1", "typescript": "^4.7.4",