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

Sphinx gallery #63

Merged
merged 9 commits into from
Jan 23, 2020
Merged

Sphinx gallery #63

merged 9 commits into from
Jan 23, 2020

Conversation

banesullivan
Copy link
Collaborator

@banesullivan banesullivan commented Jan 13, 2020

Continuation of #57 as there was a branching issue. Now this should properly have develop set as the base. See #57 for details and be sure to "squash and merge" on GitHub these changes

[temp] tutorial 1 migrate

rename tutorial 1 files

[temp] migrate tutorial 2

rename

migrate all tutorials

Reorganize examples

Fix references

Remove old doc example
@MuellerSeb
Copy link
Member

Oh no! I reviewed the wrong PR!

@MuellerSeb
Copy link
Member

@LSchueler will do the review later this day. But just a short compliment: THIS IS F+++ING AWESOME. :-)

Copy link
Member

@LSchueler LSchueler left a comment

Choose a reason for hiding this comment

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

Copy pasta from PR #57:

Hey there! Sorry for being a bit late on this, but:

THIS IS AWESOME

Thanks for your effort. I just have a few comments:

There are warnings from Matplotlib given as output in the generated files. We can suppress them with:

import warnings
warnings.filterwarnings(
"ignore",
category=UserWarning,
message='Matplotlib is currently using agg, which is a non-GUI backend, so cannot show the figure.',
)

See: https://sphinx-gallery.github.io/stable/configuration.html
2. The Herten example takes really long... I don't know if we can somehow speed that up.. but it is working for now, so I am fine with it.
3. I would put the "introduction" at the end and call it "Miscellaneous"
4. tutorial 2 has a strange structuring. I would make some more sub-items
5. I would swap the two sub-items under tutorial 3
6. tutorial 4 could be just one page

Some more comments were made in the review.
We will update the actual examples itself after merging this PR.

Thank you for the effort! You are the contributor of the quarter :-)

docs/source/conf.py Outdated Show resolved Hide resolved
docs/source/tutorials.rst Outdated Show resolved Hide resolved
@banesullivan
Copy link
Collaborator Author

Also, the examples generate some temp files like field.vtu and field.vtr. Would it make sense to add *.vtr and *.vtu to the .gitignore, or do you all have some data files that are tracked?

@banesullivan
Copy link
Collaborator Author

Also, when installing locally, the gstools/variogram/estimator.cpp file is generated. should this be ignored?

@MuellerSeb
Copy link
Member

I vote for ignoring *.cpp *.vtu, *.vtr and so on.

@MuellerSeb
Copy link
Member

On other thing: Could you add a short guide on what an example should look like to the CONTRIBUTING.md? This would be also good for us to know how to add examples the right way ;-)

@banesullivan
Copy link
Collaborator Author

  1. warnings

Done.

  1. The Herten example takes really long... I don't know if we can somehow speed that up.. but it is working for now, so I am fine with it.

I'm going to leave this as is and let you all modify the examples since I don't know everything that is going on in gstools

  1. I would put the "introduction" at the end and call it "Miscellaneous"

Done. I kept it with the 00 prefix as you wont want to rename it eveertime a new tutorial is added. But it will be shown last in the docs.

  1. tutorial 2 has a strange structuring. I would make some more sub-items

Would it make more sense for you all to organize the examples? I still barely understand everything going on in gstools so you all probably have better insight into how it should be structured.

  1. I would swap the two sub-items under tutorial 3

Like swap order? If so, done.

  1. tutorial 4 could be just one page

Hm. Would you want to add more scripts to this tutorial down the road?

@banesullivan
Copy link
Collaborator Author

On other thing: Could you add a short guide on what an example should look like to the CONTRIBUTING.md? This would be also good for us to know how to add examples the right way ;-)

Yeah, definitely! This might take me a bit to geet around to...

@MuellerSeb
Copy link
Member

@banesullivan : Just add a short sentence like:

If possible add an example showing your new feature to one of the examples sub-folders.
Follow this .... guide so it is compatible with sphinx-gallery.

That would be enough I think.

And you can leave the examples as they are now. I will have a look at them afterwards for polishing.

Thanks again mate!

@MuellerSeb
Copy link
Member

MuellerSeb commented Jan 23, 2020

And a strange thing is, that the warnings are still shown in my local build...

Edit: Sorry, false alarm. Had to remove the generated examples folder before rebuilding the docs.

Copy link
Member

@LSchueler LSchueler left a comment

Choose a reason for hiding this comment

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

Just one tiny typo, but I think then all your awesome eye candy can finally be merged!

examples/00_misc/README.rst Outdated Show resolved Hide resolved
Copy link
Member

@MuellerSeb MuellerSeb left a comment

Choose a reason for hiding this comment

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

Looks fine now.

@MuellerSeb MuellerSeb merged commit d602a55 into GeoStat-Framework:develop Jan 23, 2020
@MuellerSeb MuellerSeb mentioned this pull request Jan 25, 2020
2 tasks
@MuellerSeb MuellerSeb mentioned this pull request Mar 20, 2020
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.

3 participants