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

Improve documentation #560

Merged
merged 20 commits into from Feb 21, 2023
Merged

Conversation

martinvonk
Copy link
Collaborator

Short Description

  • Section on Pastas organisation with reference to PastaStore and Metran
  • Reference to STOWA manual
  • Reference to related Python packages
  • Remove numbered prefix so we don't have to rename (all) files after a change.

Checklist before PR can be merged:

@martinvonk martinvonk self-assigned this Feb 20, 2023
@martinvonk martinvonk added the documentation Indicates a need for improvements or additions to documentation label Feb 20, 2023
@martinvonk martinvonk changed the title Improve readthedocs Improve documentation Feb 20, 2023
@martinvonk martinvonk marked this pull request as ready for review February 20, 2023 09:02
@martinvonk martinvonk linked an issue Feb 20, 2023 that may be closed by this pull request
4 tasks
@martinvonk martinvonk added this to the 1.1 milestone Feb 20, 2023
@codacy-production
Copy link

Coverage summary from Codacy

Merging #560 (818c0c5) into dev (219cad0) - See PR on Codacy

Coverage variation Diff coverage
+0.00% (target: +0.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (219cad0) 4893 3493 71.39%
Head commit (818c0c5) 4893 (+0) 3493 (+0) 71.39% (+0.00%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#560) 0 0 ∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

doc/about/courses.rst Outdated Show resolved Hide resolved
doc/about/users.rst Outdated Show resolved Hide resolved
@raoulcollenteur
Copy link
Member

Some nice additions, but also some new errors .. ;-)

Not a big fan of all the manual linking to rst files and notebooks. Why is this better? This is prone to errors, multiple links are already not working now because of this:

https://pastas--560.org.readthedocs.build/en/560/examples/index.html

A possible fix would be to implement nblink or some url checker. Also, there are new warnings given by ReadTheDocs that should be fixed first.

@martinvonk
Copy link
Collaborator Author

martinvonk commented Feb 20, 2023

Not a big fan of all the manual linking to rst files and notebooks. Why is this better?

Now if you remove notebook 01_basic_model.ipynb from the examples folder with files:

00_prepare_timeseries.ipynb,
01_basic_model.ipynb,
02_fix_parameters.ipynb,
03_calibration_options.ipynb,
04_adding_rivers.ipynb,
05_adding_wells.ipynb,
06_multiple_wells.ipynb,
07_adding_trends.ipynb,
08_changing_responses.ipynb,
09_threshold_non_linear.ipynb,
10_non_linear_recharge.ipynb,
11_recharge_estimation.ipynb,
12_snowmodel.ipynb,
13_comparing_models.ipynb,
14_diagnostic_checking.ipynb,
15_timestep_analysis.ipynb,
16_uncertainty.ipynb,
17_emcee_uncertainty.ipynb,
18_sgi_example.ipynb,
19_signatures.ipynb

you have to rename:

00_prepare_timeseries.ipynb -> 00_prepare_timeseries.ipynb
02_fix_parameters.ipynb -> 01_fix_parameters.ipynb
03_calibration_options.ipynb -> 02_calibration_options.ipynb
04_adding_rivers.ipynb -> 03_adding_rivers.ipynb
05_adding_wells.ipynb -> 04_adding_wells.ipynb
06_multiple_wells.ipynb -> 05_multiple_wells.ipynb
07_adding_trends.ipynb -> 06_adding_trends.ipynb
08_changing_responses.ipynb -> 07_changing_responses.ipynb
09_threshold_non_linear.ipynb -> 08_threshold_non_linear.ipynb
10_non_linear_recharge.ipynb -> 09_non_linear_recharge.ipynb
11_recharge_estimation.ipynb -> 10_recharge_estimation.ipynb
12_snowmodel.ipynb -> 11_snowmodel.ipynb
13_comparing_models.ipynb -> 12_comparing_models.ipynb
14_diagnostic_checking.ipynb -> 13_diagnostic_checking.ipynb
15_timestep_analysis.ipynb -> 14_timestep_analysis.ipynb
16_uncertainty.ipynb -> 15_uncertainty.ipynb
17_emcee_uncertainty.ipynb -> 16_emcee_uncertainty.ipynb
18_sgi_example.ipynb -> 17_sgi_example.ipynb
19_signatures.ipynb -> 18_signatures.ipynb

With this change, you can simply adjust the index.rst file in the examples folder because al the files are listed there. Yes, you have to be tidy with the bookkeeping but that should not be too big of an issue.

@martinvonk
Copy link
Collaborator Author

martinvonk commented Feb 20, 2023

Also, there are new warnings given by ReadTheDocs that should be fixed first.

Should all be good now.

@martinvonk martinvonk force-pushed the 545-enhancement-improve-readthedocs branch from 25e0033 to f8aa89b Compare February 20, 2023 16:16
@raoulcollenteur
Copy link
Member

Not a big fan of all the manual linking to rst files and notebooks. Why is this better?

Now if you remove notebook 01_basic_model.ipynb from the examples folder with files:

00_prepare_timeseries.ipynb,
01_basic_model.ipynb,
02_fix_parameters.ipynb,
03_calibration_options.ipynb,
04_adding_rivers.ipynb,
05_adding_wells.ipynb,
06_multiple_wells.ipynb,
07_adding_trends.ipynb,
08_changing_responses.ipynb,
09_threshold_non_linear.ipynb,
10_non_linear_recharge.ipynb,
11_recharge_estimation.ipynb,
12_snowmodel.ipynb,
13_comparing_models.ipynb,
14_diagnostic_checking.ipynb,
15_timestep_analysis.ipynb,
16_uncertainty.ipynb,
17_emcee_uncertainty.ipynb,
18_sgi_example.ipynb,
19_signatures.ipynb

you have to rename:

00_prepare_timeseries.ipynb -> 00_prepare_timeseries.ipynb
02_fix_parameters.ipynb -> 01_fix_parameters.ipynb
03_calibration_options.ipynb -> 02_calibration_options.ipynb
04_adding_rivers.ipynb -> 03_adding_rivers.ipynb
05_adding_wells.ipynb -> 04_adding_wells.ipynb
06_multiple_wells.ipynb -> 05_multiple_wells.ipynb
07_adding_trends.ipynb -> 06_adding_trends.ipynb
08_changing_responses.ipynb -> 07_changing_responses.ipynb
09_threshold_non_linear.ipynb -> 08_threshold_non_linear.ipynb
10_non_linear_recharge.ipynb -> 09_non_linear_recharge.ipynb
11_recharge_estimation.ipynb -> 10_recharge_estimation.ipynb
12_snowmodel.ipynb -> 11_snowmodel.ipynb
13_comparing_models.ipynb -> 12_comparing_models.ipynb
14_diagnostic_checking.ipynb -> 13_diagnostic_checking.ipynb
15_timestep_analysis.ipynb -> 14_timestep_analysis.ipynb
16_uncertainty.ipynb -> 15_uncertainty.ipynb
17_emcee_uncertainty.ipynb -> 16_emcee_uncertainty.ipynb
18_sgi_example.ipynb -> 17_sgi_example.ipynb
19_signatures.ipynb -> 18_signatures.ipynb

With this change, you can simply adjust the index.rst file in the examples folder because al the files are listed there. Yes, you have to be tidy with the bookkeeping but that should not be too big of an issue.

I hope you wrote a script to write that comment ;-) I can see your point.

@raoulcollenteur
Copy link
Member

checking consistency... /home/docs/checkouts/readthedocs.org/user_builds/pastas/checkouts/560/doc/examples/diagnostic_checking.ipynb: WARNING: document isn't included in any toctree

@raoulcollenteur
Copy link
Member

Perhaps ReadTheDocs should throwing errors when these kind of things come up somehow. Now we have to manually check for errors in the built process to uncover this.

@martinvonk
Copy link
Collaborator Author

martinvonk commented Feb 20, 2023

I hope you wrote a script to write that comment ;-) I can see your point.

👼 .
Also, not having to renaming the files constantly helps with the traceability of the git commit history.

@martinvonk
Copy link
Collaborator Author

Perhaps ReadTheDocs should throwing errors when these kind of things come up somehow. Now we have to manually check for errors in the built process to uncover this.

Agree

@martinvonk
Copy link
Collaborator Author

checking consistency... /home/docs/checkouts/readthedocs.org/user_builds/pastas/checkouts/560/doc/examples/diagnostic_checking.ipynb: WARNING: document isn't included in any toctree

Fixed this, should be good now.

@raoulcollenteur
Copy link
Member

Nice work. Merging.

@raoulcollenteur raoulcollenteur merged commit cf48f09 into dev Feb 21, 2023
@raoulcollenteur raoulcollenteur deleted the 545-enhancement-improve-readthedocs branch February 21, 2023 06:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Indicates a need for improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make a list of organisations that contributed to Pastas
2 participants