feat!: replace old demo course with the new one #47

kdmccormick · 2024-01-10T15:42:17Z

This subsumes the openedx-demo-course-new into this repo, and removes the entirety of the old demo course. We will archive openedx-demo-course-new after merging this PR.

Notes for reviewers:

I made this PR by rm'ing the current repository and replacing it with the contents of https://github.com/openedx/openedx-demo-course-new, plus just a couple tweaks:
- I changed the GHA CI branches from main back to master.
- I put openedx.yaml back so this this repo continues to be released.
- I fixed the repo name in catalog-info.yaml
The insane -400k diff is probably because the jsmol library had been entirely copied into this repo previously.
Rather than trying to read the diff, I would just browse the branch a bit as a sanity check.

Operator Impact

On its own, this PR will break the tutor local do importdemocourse command in Tutor Nightly. Merging this update to Tutor Nightly will fix the command again. With that PR merged:

For Quince (and earlier) users, the default remains the old course. Specifically:
- Get the old course with tutor local do importdemocourse
- Get the new course with: tutor local do importdemocourse demo-course/course --version master && tutor local do importdemolibraries --version master
For master and Redwood+ users, the default becomes the new course. Specifically:
- Get the old course with: tutor local do importdemocourse --version open-release/quince.1
- Get the new course and library with: tutor local do importdemocourse && tutor local do importdemolibraries

The old demo course can still be accessed by checking out named release tags of this repo.

kdmccormick · 2024-01-10T17:57:56Z

@sarina One last PR for you! With this one merged and the linked Tutor PR merged, we'll be fully prepped to switch over to the new demo course for Redwood.

sarina · 2024-01-10T21:45:45Z

.github/workflows/ci.yml

+
+on:
+    pull_request:
+        branches: ["master"]


should this be "main"?

nevermind I misunderstood this PR, read more carefully now. GTG

sarina · 2024-01-10T21:59:14Z

This looks good, before I give thumbs-up I want to do a quick test of the tar.gz into my personal instance, which I'll do now

Edit: I'm getting errors; I'll work with John to resolve them this week.

sarina · 2024-01-18T17:30:28Z

This should be updated with the changes made in openedx-unsupported/openedx-demo-course-new#4 - once that's done we can go ahead and merge.

Copied over from openedx-unsupported/openedx-demo-course-new#4 Co-Authored-By: John Swope <[email protected]>

When temporary operating-system-specific files like .DS_Store (a macOS Finder artifact) are packed into the dist/ tars, it creates version control noise and can make the source-matches-tars check fail unnecessarily. This updates `make dist` to first `git clean` away any git-ignored files. It also changes `make unpack` to work in the case where the source directories are missing, which is useful when you want to unpack the tars from scratch. Finally, this commit re-runs `make dist`, so that the dist/ tars no longer have unnecessary OS-specific files in them.

kdmccormick · 2024-01-18T20:31:11Z

@sarina I pushed two commits, ready for your review:

Copy in @jswope00 's recent changes: ab4a57a
Remove some macOS hidden-file-cruft from the OLX tars, and update the Makefile so that cruft doesn't get added to the tars next time: 59e6320

I just need to address Régis's comments over on the Tutor PR, and then I think we're all set!

sarina

Thanks Kyle, merge away when ready!

sarina · 2024-01-29T15:31:02Z

Hey @kdmccormick - we merged in one more change to https://github.com/openedx/openedx-demo-course-new - it'd be good to get this updated & merged, so we can close down the openedx-demo-course-new repo and churn on this PR. Let me know the best way to proceed - should we merge this and port the changes from the last PR in a separate PR?

kdmccormick · 2024-02-06T17:04:54Z

@sarina I was holding off on merging this because it'll break importdemocourse in Tutor Nightly unless the Tutor PR is merged first. The drift between this and openedx-demo-course-new isn't good, though, so I'm going to merge this now and the Tutor fix will be a fast follow.

This follows changes made in openedx/openedx-demo-course#47

In openedx/openedx-demo-course#47 the demo course was replaced. This includes a new course key (new name and org) and the course content being moved a few directories deeper. Changes: - `sed -i 's/course-v1:edX+DemoX+Demo_Course/course-v1:Axim+DemoX+demo_course/g'` on all files turned up by `grep -rl Demo_Course` - Updated a few other course info locations turned up with `grep -nrI DemoX | grep -x demo_course` (all in programs/discovery.py) - Updated git clone URL and checkout location in provision-lms.sh to use new repo name (not strictly needed).

kdmccormick force-pushed the kdmccormick/new-demo-course branch from a1d752b to 65c9cea Compare January 10, 2024 17:19

feat!: replace old demo course with the new one

a2c735b

The old demo course can still be accessed by checking out named release tags of this repo.

kdmccormick force-pushed the kdmccormick/new-demo-course branch from 65c9cea to a2c735b Compare January 10, 2024 17:20

kdmccormick mentioned this pull request Jan 10, 2024

feat!: default importdemocourse to the new course & lib overhangio/tutor#976

Closed

kdmccormick marked this pull request as ready for review January 10, 2024 17:27

kdmccormick requested a review from sarina January 10, 2024 17:58

sarina reviewed Jan 10, 2024

View reviewed changes

kdmccormick and others added 2 commits January 18, 2024 13:27

fix: Course Cleanup and Import Fixes

ab4a57a

Copied over from openedx-unsupported/openedx-demo-course-new#4 Co-Authored-By: John Swope <[email protected]>

sarina approved these changes Jan 18, 2024

View reviewed changes

kdmccormick merged commit 4104aa8 into master Feb 6, 2024
3 checks passed

kdmccormick deleted the kdmccormick/new-demo-course branch February 6, 2024 17:05

timmc-edx added a commit to openedx-unsupported/devstack that referenced this pull request Feb 7, 2024

fix: Use new location for demo course base XML file

9595897

This follows changes made in openedx/openedx-demo-course#47

timmc-edx mentioned this pull request Feb 7, 2024

fix: Update for new version of demo course openedx-unsupported/devstack#1272

Open

1 task

timmc-edx mentioned this pull request Feb 7, 2024

Devstack provisioning breaks with new demo course openedx-unsupported/devstack#1273

Open

UsamaSadiq mentioned this pull request Oct 18, 2024

Devstack provisioning breaks with new demo course edx/devstack#53

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: replace old demo course with the new one #47

feat!: replace old demo course with the new one #47

kdmccormick commented Jan 10, 2024 •

edited

Loading

kdmccormick commented Jan 10, 2024

sarina Jan 10, 2024

sarina Jan 10, 2024

sarina commented Jan 10, 2024 •

edited

Loading

sarina commented Jan 18, 2024

kdmccormick commented Jan 18, 2024

sarina left a comment

sarina commented Jan 29, 2024

kdmccormick commented Feb 6, 2024

feat!: replace old demo course with the new one #47

feat!: replace old demo course with the new one #47

Conversation

kdmccormick commented Jan 10, 2024 • edited Loading

Operator Impact

kdmccormick commented Jan 10, 2024

sarina Jan 10, 2024

Choose a reason for hiding this comment

sarina Jan 10, 2024

Choose a reason for hiding this comment

sarina commented Jan 10, 2024 • edited Loading

sarina commented Jan 18, 2024

kdmccormick commented Jan 18, 2024

sarina left a comment

Choose a reason for hiding this comment

sarina commented Jan 29, 2024

kdmccormick commented Feb 6, 2024

kdmccormick commented Jan 10, 2024 •

edited

Loading

sarina commented Jan 10, 2024 •

edited

Loading