Skip to content

Doc move to sphinx #83

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

Merged
merged 1 commit into from
Nov 11, 2021
Merged

Conversation

jklymak
Copy link
Member

@jklymak jklymak commented Nov 9, 2021

This moves the website to sphinx instead of raw html...

Closes #82

NewCheatsheets

@jklymak
Copy link
Member Author

jklymak commented Nov 9, 2021

OK, this seems to work. It would be nice to also add circleCI so that we could see the page before it built, but...

@jklymak jklymak added the enhancement New feature or request label Nov 9, 2021
@jklymak jklymak force-pushed the doc-move-to-sphinx branch from 8a50df2 to 3bed939 Compare November 9, 2021 15:00
@rougier
Copy link
Member

rougier commented Nov 9, 2021

Is it possible to have cheatsheets side by side instead of top of each other?

@jklymak
Copy link
Member Author

jklymak commented Nov 9, 2021

Almost certainly, but maybe as a follow up? We have things side-by-side on the main site so I am sure we can figure out how to do that.

@jklymak
Copy link
Member Author

jklymak commented Nov 10, 2021

Changed the GitHub action to also upload the doc build.

This PR would need to be merged before we can see CircleCI (and @tacaswell (or maybe @QuLogic) would have to grant it permission on the circleCI page).

@jklymak
Copy link
Member Author

jklymak commented Nov 10, 2021

Latest commit makes the page with two and three columns:
BetterLayout

@QuLogic
Copy link
Member

QuLogic commented Nov 10, 2021

I'm not sure if we need to enable anything for Circle; it only triggers from config on the default branch, not PRs.

@jklymak
Copy link
Member Author

jklymak commented Nov 10, 2021

I'm a little confused about our merge policy on this project.

I think the policy should be: changes to the actual cheatsheets @rougier must approve, but changes to the CI and webpage can be done more generally by the Matplotlib team?

@jklymak
Copy link
Member Author

jklymak commented Nov 10, 2021

@jimustafa Any comments/review on this? You have been doing the bulk of the maintenance here... Thanks!

@rougier
Copy link
Member

rougier commented Nov 10, 2021

@jklymak For cheatsheets, I think all the Matpltolib team should be able to approve PR, especially when it's not a big change. For bigger changes, I would be happy to keep an eye of it but nothing mandatory.

@jklymak
Copy link
Member Author

jklymak commented Nov 10, 2021

@rougier OK, that sounds reasonable; we will be sure to request a review if something is major and/or aesthetic!

@jimustafa
Copy link
Contributor

I'm not sure if we need to enable anything for Circle; it only triggers from config on the default branch, not PRs.

I had a similar question. It seems that the circle config is basically the same as for matplotlib/mpl-brochure-site, and there the documents appear to be built and hosted for PRs. Could one of the checks for PRs here be a review of the built docs hosted on circle?

I checked out this PR and was able to build the docs with make docs, nice!. LGTM. A couple of questions/comments... How will the "Search Docs" work for what seems to be a separate site? The headers "Cheatsheets:" and "Handouts:" look a bit odd (the colons) when used in the navigation pane on the right.

Copy link
Contributor

@jimustafa jimustafa left a comment

Choose a reason for hiding this comment

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

The MPLBACKEND specification is a good idea for a more reproducible build, nice!


# -- Project information -----------------------------------------------------

html_title = 'Visualization with Python'
Copy link
Contributor

Choose a reason for hiding this comment

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

title -> "Matplotlib Cheatsheets"

Copy link
Member Author

Choose a reason for hiding this comment

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

So, the actual title ends up being "Matplotlib Cheatsheets - Visualization with Python" so I think this is OK.

html_title = 'Visualization with Python'
project = "Matplotlib cheatsheets"
copyright = (
f"2012 - {datetime.datetime.now().year} The Matplotlib development team"
Copy link
Contributor

Choose a reason for hiding this comment

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

Does the copyright years to be be different for the cheatsheets?

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess the appearance is that it should look like the rest of the docs, so the webpage should stay this way. The cheatsheets may of course have their own copyright.

@jklymak
Copy link
Member Author

jklymak commented Nov 11, 2021

The MPLBACKEND specification is a good idea for a more reproducible build, nice!

Well, this was just because my conda env didn't have pyqt5 downloaded, and I realized we probably didn't want the build script to require a GUI framework.

@jklymak
Copy link
Member Author

jklymak commented Nov 11, 2021

I'm not sure if we need to enable anything for Circle; it only triggers from config on the default branch, not PRs.

I had a similar question. It seems that the circle config is basically the same as for matplotlib/mpl-brochure-site, and there the documents appear to be built and hosted for PRs. Could one of the checks for PRs here be a review of the built docs hosted on circle?

Yep, that was the plan; there will need to be a circle CI follow up as I'm sure I didn't do it properly, and we should add the action to post the link.

@tacaswell
Copy link
Member

I'm going to merge this and then enable circle (the web UI won't let you enable a repo until it can see a config yaml in the branch you want to run off of).

@tacaswell tacaswell merged commit 7ca0fd6 into matplotlib:master Nov 11, 2021
@tacaswell
Copy link
Member

@jklymak jklymak deleted the doc-move-to-sphinx branch November 11, 2021 15:22
@jklymak
Copy link
Member Author

jklymak commented Nov 11, 2021

Yes, circle is definitely broken. Not sure how to install all the deps....

@jimustafa jimustafa mentioned this pull request Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Style the website
5 participants