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

feat: Drop the use of the Tubular repository #34

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

mrtmm
Copy link

@mrtmm mrtmm commented Mar 26, 2024

The Tubular repository has been deplrecated and the relevant scripts have been moved to the edx-platform codebase.

@fghaas
Copy link
Contributor

fghaas commented Mar 28, 2024

@mrtmm, If you add Fixes: #32 at the end of your commit message, then that issue will auto-close once we merge this commit to main.

@mrtmm
Copy link
Author

mrtmm commented Mar 28, 2024

Ah, nice, thanks!

@mrtmm mrtmm force-pushed the tubular-depr branch 2 times, most recently from f3e0737 to 8ed57d0 Compare March 28, 2024 12:36
@mrtmm mrtmm changed the title feat: (WIP) Drop the use of the Tubular repository feat: Drop the use of the Tubular repository Mar 28, 2024
@mrtmm mrtmm force-pushed the tubular-depr branch 2 times, most recently from ea158b3 to eb00906 Compare July 19, 2024 11:14
@mrtmm mrtmm force-pushed the tubular-depr branch 4 times, most recently from 528a390 to ea65f07 Compare July 29, 2024 11:21
@fghaas
Copy link
Contributor

fghaas commented Jul 31, 2024

@mrtmm I think if you rebase your topic branch on current main, then we can undo the Draft status on this PR and merge it.

We can also cut one more 3.x release from the current state of main, and then merge this PR and cut 4.0.0 from it.

@mrtmm
Copy link
Author

mrtmm commented Aug 1, 2024

Hmm, maybe it will be good to cut one more 3.x release in case someone needs the latest fixes in quince?

@fghaas
Copy link
Contributor

fghaas commented Aug 1, 2024

Hmm, maybe it will be good to cut one more 3.x release in case someone needs the latest fixes in quince?

Yes, sounds good. Please go ahead and do that.

README.md Outdated
@@ -21,6 +21,7 @@ appropriate one:
| Olive | `>=15.0, <16` | `main` | 2.x.x |
Copy link
Author

Choose a reason for hiding this comment

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

@fghaas should we create release named branches here now until Quince?

@mrtmm mrtmm force-pushed the tubular-depr branch 2 times, most recently from 1a297fe to ca028d2 Compare August 2, 2024 05:47
@mrtmm mrtmm marked this pull request as ready for review August 2, 2024 05:48
Copy link
Contributor

@fghaas fghaas left a comment

Choose a reason for hiding this comment

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

Looks good to me in general; I just have one question.

@@ -0,0 +1,14 @@
cool_off_days=$1
pip install --upgrade pip && pip install -r scripts/user_retirement/requirements/base.txt --exists-action w
Copy link
Contributor

Choose a reason for hiding this comment

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

Just so I understand this correctly: retirement has moved into the platform repo, but the packages needed for retirement don't actually get baked into the default Tutor openedx image, meaning we have to install them every time we run the retirement scripts?

Copy link
Author

Choose a reason for hiding this comment

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

Yes, those requirements are under the /scripts/user_retirement directory and not installed in the openedx image.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, doesn't that run counter to the idea of having pre-built container images though?

(In other words: should we perhaps continue to build images, just as we did prior to Redwood?)

Copy link
Author

Choose a reason for hiding this comment

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

Hmm, okay, I guess we can do that also yes.

Copy link
Author

Choose a reason for hiding this comment

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

Should I go ahead and update this with building the image?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think so, yes.

The Tubular repository has been deplrecated and the relevant
scripts have been moved to the edx-platform codebase.

* Drop the use of the Tubulas repository and install the retirement
  scripts from edx-platform..
* Add support for Tutor 18 / Open edX Redwood.

Fixes: hastexo#32
@mrtmm mrtmm requested a review from fghaas August 6, 2024 08:27
Copy link
Contributor

@fghaas fghaas left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@mrtmm mrtmm merged commit 8f0587d into hastexo:main Aug 6, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants