Skip to content

Commit

Permalink
Update tutorial
Browse files Browse the repository at this point in the history
- add background information,
- add model-specific information
- add technical information
- update code comments
- update exercise 1
- delete .rst and .pngs due to addition of nbsphinx

Co-authored-by: rht <rhtbot@protonmail.com>
Co-authored-by: tpike3 <tpike3@gmu.edu>
  • Loading branch information
3 people committed May 15, 2023
1 parent 02592f3 commit cbd7a43
Show file tree
Hide file tree
Showing 19 changed files with 297 additions and 1,679 deletions.
12 changes: 2 additions & 10 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,13 @@ This folder contains the docs that build the docs for the core mesa code on read

Updating docs can be confusing. Here are the basic setups.

#### Create the rST files from ipynb files
1. Change to the appropriate directory (usually docs/tutorials)
* `cd tutorials`
1. Create rST files using nbconvert
* `jupyter nbconvert --to rST *.ipynb`
* **Requires**
* jupyter: `pip install jupyter`
* [pandoc](http://pandoc.org/installing.html)

##### Submit a pull request with updates
1. Create branch (either via branching or fork of repo) -- try to use a descriptive name.
* `git checkout -b doc-updates`
1. Update the docs. Save.
1. Build the docs, from the inside of the docs folder.
* **Requires** sphinx: `pip install sphinx`
* **Requires** nbsphinx: `pip install nbsphinx` (this will render the images from jupyter in the docs)
* `make html`
1. Commit the changes. If there are new files, you will have to explicit add them.
* `git commit -am "Updating docs."`
Expand All @@ -33,7 +25,7 @@ Updating docs can be confusing. Here are the basic setups.

##### Update read the docs

From this point, you will need to find someone that has access to readthedocs. Currently, that is [@jackiekazil](https://github.com/jackiekazil) and [@dmasad](https://github.com/dmasad).
From this point, you will need to find someone that has access to readthedocs. Currently, that is [@jackiekazil](https://github.com/jackiekazil), [@rht](https://github.com/rht), and [@tpike3](https://github.com/dmasad).

1. Accept the pull request into main.
1. Log into readthedocs and launch a new build -- builds take about 10 minutes or so.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ABM features users have shared that you may want to use in your model
:maxdepth: 7

Mesa Overview <overview>
tutorials/intro_tutorial
tutorials/intro_tutorial.ipynb
tutorials/adv_tutorial.ipynb
Best Practices <best-practices>
Useful Snippets <useful-snippets/snippets>
Expand Down
Binary file removed docs/tutorials/files/output_19_1.png
Binary file not shown.
747 changes: 294 additions & 453 deletions docs/tutorials/intro_tutorial.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit cbd7a43

Please sign in to comment.