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 readthedocs #262

Merged
merged 11 commits into from
Dec 15, 2022
Merged

Fix readthedocs #262

merged 11 commits into from
Dec 15, 2022

Conversation

hshuaib90
Copy link
Collaborator

@hshuaib90 hshuaib90 commented Jul 30, 2022

Fixes #252

Currently missing images for tasks. Happy to add those if someone can give them to me.

See https://hazen.readthedocs.io/en/fix-readthedocs/ for working branch

@github-actions
Copy link

github-actions bot commented Jul 30, 2022

Deleting this, also acts as a test of webhook for ReadTheDocs
@hshuaib90 hshuaib90 linked an issue Jul 30, 2022 that may be closed by this pull request
@hshuaib90 hshuaib90 requested a review from heyhaleema July 30, 2022 17:58
@hshuaib90 hshuaib90 linked an issue Jul 30, 2022 that may be closed by this pull request
@hshuaib90 hshuaib90 requested a review from tomaroberts July 30, 2022 18:05
@hshuaib90 hshuaib90 changed the base branch from main to release/0.7.0 July 30, 2022 18:06
@hshuaib90 hshuaib90 added this to the 0.7.0 milestone Jul 30, 2022
@heyhaleema
Copy link
Collaborator

@Lucrezia-Cester Thanks for offering to add the missing images! This is likely because it was based on the hazen web app repo, so you'll find them here. As discussed, I've had a look at the Read the Docs site and so once this is merged into main, the stable version should build successfully.

@laurencejackson Adding you as an additional reviewer onto this PR since it contains some core hazen commits.

Should we try to set some time aside to clear out the pending PRs?

@Lucrezia-Cester
Copy link
Contributor

Hi, Haleema, thank you for looking at this. @laurencejackson, @heyhaleema, Yup, just let me know when you both have some free time.

@Lucrezia-Cester
Copy link
Contributor

Hi @heyhaleema, sorry for asking you to do extra work, this morning I had a chat with Haris and he asked if the commits related to the readthedocs PR could be placed in a new branch separately?

Let me know if you are up for it otherwise I'll try to do it.

@hshuaib90
Copy link
Collaborator Author

Sorry to clarify, as this branch is for RTD - can the other commits be put into another branch

@heyhaleema
Copy link
Collaborator

heyhaleema commented Nov 18, 2022

@hshuaib90 @Lucrezia-Cester I'm happy to do the git rebase and squash/fixup to remove the non-RTD commits from this branch/PR.

@laurencejackson Would you like me to add the non-RTD commits to a new branch, or are these already included in another branch/PR?

@tomaroberts I'll go ahead with discarding your commits in this branch since it seems like they've been merged already.

@laurencejackson laurencejackson changed the base branch from release/0.7.0 to main November 30, 2022 10:49
@laurencejackson laurencejackson changed the base branch from main to release/0.7.0 November 30, 2022 10:49
@laurencejackson laurencejackson changed the base branch from release/0.7.0 to main November 30, 2022 10:50
heyhaleema
heyhaleema previously approved these changes Nov 30, 2022
Copy link
Collaborator

@heyhaleema heyhaleema 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 👍

@heyhaleema
Copy link
Collaborator

@hshuaib90 I'd approved your changes, but I've just noticed there's a merge conflict with newdocs/source/contributors.rst, so I can re-review once this is resolved.

@Lucrezia-Cester
Copy link
Contributor

Hi @hshuaib90, could you please fix the merge conflict suggested by Haleema?

@hshuaib90
Copy link
Collaborator Author

Thanks for reminder @Lucrezia-Cester . @heyhaleema and I had a chat last week and she is going to fix the conflict.

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.

Link documentation to ReadTheDocs hazen page Add Sphinx documentation
3 participants