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

Documentation Generation #50

Merged
merged 6 commits into from
May 21, 2021
Merged

Documentation Generation #50

merged 6 commits into from
May 21, 2021

Conversation

bajo1207
Copy link
Contributor

Merge documentation generation to be able to generate documentation on the master branch.

@bajo1207 bajo1207 added documentation Improvements or additions to documentation enhancement New feature or request labels May 19, 2021
@bajo1207 bajo1207 added this to the Project Deadline milestone May 19, 2021
@bajo1207 bajo1207 requested a review from VasLem May 19, 2021 12:33
@bajo1207 bajo1207 self-assigned this May 19, 2021
@bajo1207
Copy link
Contributor Author

Git wants to make changes on prep_hdro_v2.ipynb. I've tried to merge master into branch first, but for some reason it says that everything is up to date.. Is it possible to make github not consider the changes to prep_hdro_v2.ipynb here in this pull request?

@VasLem
Copy link
Contributor

VasLem commented May 19, 2021

Git wants to make changes on prep_hdro_v2.ipynb. I've tried to merge master into branch first, but for some reason it says that everything is up to date.. Is it possible to make github not consider the changes to prep_hdro_v2.ipynb here in this pull request?

Have you committed changes locally to that notebook?

@bajo1207
Copy link
Contributor Author

I unintentionally added it in this commit c83f9dd.

@VasLem
Copy link
Contributor

VasLem commented May 19, 2021

If you want to drop the changes you can checkout the file from master using:
git checkout master -- FILE_PATH
(while in the current branch)
(and you need to git add, commit and push the change)
If you don't want to drop them, copy it somewhere beforehand and then paste it back once you have changed to the branch it was supposed to be. (hacky solution but the alternative sucks)

@bajo1207
Copy link
Contributor Author

Thanks! 👍 Should be all right to merge now.

@VasLem
Copy link
Contributor

VasLem commented May 19, 2021

Checked, everything looks nice. Only one question, could we also get to render jupyter notebooks inside the documentation? This is for a multitude of reasons:

  • Allow user to access jupyter markdown while not in repository
  • Allow user to see output of jupyter directly in the github pages
  • Reference notebooks sequence required to run from the user
    Related to this which has preasummingly a solution here , which is implemented here

@VasLem VasLem linked an issue May 20, 2021 that may be closed by this pull request
@VasLem
Copy link
Contributor

VasLem commented May 20, 2021

By the way, do we need to make repository public for this to play?

@bajo1207
Copy link
Contributor Author

bajo1207 commented May 20, 2021

As i wrote in #44:

In order to deploy it as on github pages, this repository needs to be public. I suggest we make the repo public right before we hand in the project, so the professor can explore our workflow etc. The documentation can also then be published, here is how to do it.

So for now, we don't need to make it public.

@bajo1207 bajo1207 merged commit f1316bb into master May 21, 2021
@bajo1207 bajo1207 deleted the documentation_gen branch May 21, 2021 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add documentation html page
2 participants