Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Correcting patch file and making changes to make jupyter work in dev env #12

Merged
merged 3 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-18.1.0'></a>
## v18.1.0 (2024-09-15)

- 💥[Feature] Make the plugin work in development mode by adding `openedx-development-settings`. (by @Abdul-Muqadim-Arbisoft)

<a id='changelog-18.0.0'></a>
## v18.0.0 (2024-06-20)

Expand Down
2 changes: 1 addition & 1 deletion tutorjupyter/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "18.0.0"
__version__ = "18.1.0"
3 changes: 0 additions & 3 deletions tutorjupyter/patches/dev-docker-compose-services

This file was deleted.

8 changes: 8 additions & 0 deletions tutorjupyter/patches/local-docker-compose-dev-services
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
jupyterhub:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, why is this needed now? How was it working before?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Abdul-Muqadim-Arbisoft following up on this. Plus, having the info in the PR description will be helpful as well

Copy link
Collaborator Author

@Abdul-Muqadim-Arbisoft Abdul-Muqadim-Arbisoft Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this PR to draft, since needs some more modifications, will add description as well , tutor Jupyter was never working before on dev but it was only working on local, due to wrong patch file there is no such path as dev-docker-compose-services

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have completed the testing, and the description has been updated accordingly. The Tutor Jupyter plugin now functions correctly in both development and local modes.

command: jupyterhub --port=9045
ports:
- "9045:9045"
stdin_open: true
tty: true
environment:
NETWORK_NAME: "{{ DEV_PROJECT_NAME }}_default"
3 changes: 3 additions & 0 deletions tutorjupyter/patches/openedx-development-settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
LTI_DEFAULT_JUPYTER_PASSPORT_ID = "{{ JUPYTER_DEFAULT_PASSPORT_ID }}"
LTI_DEFAULT_JUPYTER_HUB_URL = "{% if ENABLE_HTTPS %}%https{% else %}http{% endif %}://{{ JUPYTER_HOST }}:9045"