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

chore: Switch from edx-sphinx-theme to sphinx-book-theme. #268

Merged

Conversation

xitij2000
Copy link
Contributor

@xitij2000 xitij2000 commented Mar 24, 2023

The edx-sphinx theme is being deprecated, and replaced with sphinx-book-theme. This removes references to the deprecated theme and replaces them with the new standard theme for the platform.

Testing instructions:

  • Run make docs and see that the docs are generated properly and use the sphinx-book-theme

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Mar 24, 2023
@openedx-webhooks
Copy link

Thanks for the pull request, @xitij2000! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@codecov
Copy link

codecov bot commented Mar 24, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (cf0e1bb) 100.00% compared to head (3ed927a) 100.00%.

❗ Current head 3ed927a differs from pull request most recent head 7e25da2. Consider uploading reports for the commit 7e25da2 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##            master      #268   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           16        16           
  Lines          436       436           
  Branches        47        47           
=========================================
  Hits           436       436           
Flag Coverage Δ
unittests 100.00% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@xitij2000 xitij2000 changed the title feat: Switch from edx-sphinx-theme to sphinx-book-theme chore: Switch from edx-sphinx-theme to sphinx-book-theme Mar 24, 2023
@xitij2000 xitij2000 force-pushed the kshitij/switch-to-sphinx-book-theme branch from a97f649 to 3ed927a Compare March 24, 2023 07:43
@mphilbrick211 mphilbrick211 requested review from jmbowman and a team March 24, 2023 19:22
@mphilbrick211
Copy link

Hi @openedx/arch-bom - would someone be able to review this and merge if all looks good? Thanks!

Copy link

@rgraber rgraber left a comment

Choose a reason for hiding this comment

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

Please remove the unrelated requirements/ changes. It will make rollback easier if it becomes necessary, and help us keep track of what changes were made when

"repository_url": "https://github.com/openedx/django-user-tasks",
"repository_branch": "master",
"path_to_docs": "docs/",
"home_page_in_toc": True,
Copy link

Choose a reason for hiding this comment

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

[question] Why are we leaving out logo_only ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Support for that seems to have been removed in this PR: https://github.com/executablebooks/sphinx-book-theme/pull/668/files#diff-56e5475bc04460ee05cd5ac9199ebbfa3e21f1bfa64ce5469cfb2f1890b41ccfL42

There is now a different mechanism for this as outlined here: executablebooks/sphinx-book-theme@b0e6b52#diff-ffa6fcfcf96f0b20b242a31c1346439658bb90a4e42e3c8fc8d0b1bc3d4b7277L59

The new default behaviour seems to match logo_only = True though.

@Cup0fCoffee
Copy link

👍 Conditional approval, for when the unnecessary changes in the requirements/* files are removed.

  • I tested this: ran make docs
  • I read through the code
  • Includes documentation

@mphilbrick211
Copy link

Hi @xitij2000 - just flagging the feedback here. Thanks!

docs/conf.py Outdated
href="https://openedx.org"
property="cc:attributionName"
rel="cc:attributionURL"
>The Center for Reimagining Learning</a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
>The Center for Reimagining Learning</a>
>The Axim Collaborative</a>

@xitij2000 xitij2000 force-pushed the kshitij/switch-to-sphinx-book-theme branch 2 times, most recently from d152dcd to 4b9c6d0 Compare April 19, 2023 10:01
The edx-sphinx theme is being deprecated, and replaced with sphinx-book-theme.
This removes references to the deprecated theme and replaces them with the new
standard theme for the platform.

See https://github.com/openedx/edx-sphinx-theme/issues/184
@xitij2000 xitij2000 force-pushed the kshitij/switch-to-sphinx-book-theme branch from 4b9c6d0 to 7e25da2 Compare April 21, 2023 05:27
@feanil feanil changed the title chore: Switch from edx-sphinx-theme to sphinx-book-theme chore: Switch from edx-sphinx-theme to sphinx-book-theme. Apr 21, 2023
@feanil feanil dismissed rgraber’s stale review April 21, 2023 14:21

The requirements have been re-built correctly.

@feanil feanil merged commit 5f32112 into openedx:master Apr 21, 2023
@openedx-webhooks
Copy link

@xitij2000 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@xitij2000 xitij2000 deleted the kshitij/switch-to-sphinx-book-theme branch April 28, 2023 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changes requested open-source-contribution PR author is not from Axim or 2U
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants