Skip to content

Commit e534253

Browse files
committed
Restructures development guide with subsections
- Fixes links in development guide - Minor renaming
1 parent 17e1a96 commit e534253

File tree

9 files changed

+46
-500
lines changed

9 files changed

+46
-500
lines changed

doc/development/Guide_Euler.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"\n",
9393
"### 3. Adjust the Climada configuration\n",
9494
"\n",
95-
"Edit a configuration file according to your needs (see [Guide_Configuration](../guide/Guide_Configuration.ipynb)).\n",
95+
"Edit a configuration file according to your needs (see [Guide_Configuration](Guide_Configuration.ipynb)).\n",
9696
"Create a climada.conf file e.g., in /cluster/home/$USER/.config with the following content:\n",
9797
"\n",
9898
"```json\n",
@@ -140,7 +140,7 @@
140140
"\n",
141141
"### 1. Load dependencies \n",
142142
"\n",
143-
"See [Load dependencies](#1.-load-dependencies) above."
143+
"See [Load dependencies](#load-dependencies) above."
144144
]
145145
},
146146
{
@@ -159,7 +159,6 @@
159159
"cell_type": "markdown",
160160
"metadata": {},
161161
"source": [
162-
"\n",
163162
"### 3. Checkout sources\n",
164163
"\n",
165164
"```bash\n",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
################
2+
Coding in python
3+
################
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
8+
Guide_PythonDos-n-Donts
9+
Guide_Exception_Logging
10+
Performance and Best Practices <Guide_Py_Performance>

doc/development/dev-git.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
###############################
2+
Using git and GitHub to develop
3+
###############################
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
:hidden:
8+
9+
Development with Git <Guide_Git_Development>
10+
Guide_continuous_integration_GitHub_actions

doc/development/index.rst

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
.. include:: ../misc/CONTRIBUTING.md
2-
:parser: commonmark
1+
.. include:: ../../CONTRIBUTING.md
2+
:parser: myst_parser.sphinx_
33

44
.. toctree::
5-
:maxdepth: 1
6-
:caption: Developer Guide
5+
:maxdepth: 2
76
:hidden:
87

98
Developer guide <Guide_CLIMADA_Development>
10-
Development with Git <Guide_Git_Development>
11-
Guide_CLIMADA_Tutorial
12-
Guide_Configuration
13-
Guide_Testing
14-
Guide_continuous_integration_GitHub_actions
15-
Guide_Review
16-
Guide_PythonDos-n-Donts
17-
Guide_Exception_Logging
18-
Performance and Best Practices <Guide_Py_Performance>
9+
Development with Git <dev-git>
10+
Coding in python <coding-in-python>
1911
CLIMADA Coding Conventions <Guide_CLIMADA_conventions>
20-
Building the Documentation <../misc/README>
12+
Documenting your code <write-documentation>
13+
Writing tests for your code <Guide_Testing>
14+
Guide_Review
15+
Guide_Euler
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
###########################
2+
Documentation writing
3+
###########################
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
8+
Guide_CLIMADA_Tutorial
9+
Building the Documentation <../README>

doc/getting-started/0_10min_climada.ipynb

Lines changed: 0 additions & 452 deletions
This file was deleted.

doc/development/Guide_Introduction.ipynb renamed to doc/getting-started/Guide_Introduction.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
],
7171
"metadata": {
7272
"kernelspec": {
73-
"display_name": "Python 3",
73+
"display_name": "Python 3 (ipykernel)",
7474
"language": "python",
7575
"name": "python3"
7676
},
@@ -84,7 +84,7 @@
8484
"name": "python",
8585
"nbconvert_exporter": "python",
8686
"pygments_lexer": "ipython3",
87-
"version": "3.8.8"
87+
"version": "3.12.6"
8888
}
8989
},
9090
"nbformat": 4,

doc/development/Guide_get_started.ipynb renamed to doc/getting-started/Guide_get_started.ipynb

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"id": "trying-bronze",
66
"metadata": {},
77
"source": [
8-
"# Getting started with CLIMADA"
8+
"# Climada documentation"
99
]
1010
},
1111
{
@@ -42,31 +42,6 @@
4242
"It is best to have some basic knowledge of Python programming before starting with CLIMADA. But if you need a quick introduction or reminder, have a look at the short [Python Tutorial](../tutorial/0_intro_python.ipynb). Also have a look at the python [Python Dos and Don't](../guide/Guide_PythonDos-n-Donts.ipynb) guide and at the [Python Performance Guide](../guide/Guide_Py_Performance.ipynb) for best practice tips."
4343
]
4444
},
45-
{
46-
"cell_type": "markdown",
47-
"id": "c6ae7939",
48-
"metadata": {},
49-
"source": [
50-
"## Apps for working with CLIMADA\n",
51-
"\n",
52-
"To work with CLIMADA, you will need an application that supports Jupyter Notebooks.\n",
53-
"There are plugins available for nearly every code editor or IDE, but if you are unsure about which to choose, we recommend [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/), [Visual Studio Code](https://code.visualstudio.com/) or [Spyder](https://www.spyder-ide.org/).\n",
54-
"It is easy to get confused by all the different softwares and their uses so here is an overview of which tools we use for what:"
55-
]
56-
},
57-
{
58-
"cell_type": "markdown",
59-
"id": "25ab3b98",
60-
"metadata": {},
61-
"source": [
62-
"| Use | Tools | Description | Useful for |\n",
63-
"|:----------------------------------|:---------------------|:------------|:-----------|\n",
64-
"| Distribution /<br>manage virtual environment<br>& packages | Recommended:<br>Mamba<br>Alternatives:<br>Anaconda|<li>Install climada, manage & use the climada virtual environment, install packages</li><li>Anaconda includes Anaconda navigator, which is a desktop GUI and can be used to launch applications like Jupyter Notebook, Spyder etc.</li></ul>| Climada Users<br>& Developers|\n",
65-
"| IDE<br>(Integrated Development Environment)|Recommended:<br>VSCode<br>Alternatives:<br>Spyder<br>JupyterLab<br>PyCharm<br>& many more|<li>Write and run code</li> Useful for Developers:<li>VSCode also has a GUI to commit changes to Git (similar to GitHub Desktop, but in the same place as your code)</li><li>VSCode test explorer shows results for individual tests & any classes and files containing those tests (folders display a failure or pass icon)</li></ul>|Climada Users<br>& Developers|\n",
66-
"| Git GUI<br>(Graphical User Interface)|GitHub Desktop<br>Gitkraken|<li>Provides an interface which keeps track of the branch you’re working on, changes you made etc.</li><li>Allows you to commit changes, push to GitHub etc. without having to use command line</li><li>The code itself is not written using these applications but with your IDE of choice(see above)</li></ul>|Climada Developers|\n",
67-
"| Continuous integration<br>(CI) server|Jenkins|<li>Automatically checks code changes in GitHub repositories, e.g. when you create a pull request for the develop branch</li><li>Performs static code analysis using pylint</li><li>you don't need to do any installations yourself, this runs automatically when you push new code to GitHub</li><li>see [Continuous Integration and GitHub Actions](../guide/Guide_continuous_integration_GitHub_actions.ipynb)</li></ul>|Climada Developers|"
68-
]
69-
},
7045
{
7146
"cell_type": "markdown",
7247
"id": "touched-penetration",
@@ -108,7 +83,7 @@
10883
],
10984
"metadata": {
11085
"kernelspec": {
111-
"display_name": "climada_env",
86+
"display_name": "Python 3 (ipykernel)",
11287
"language": "python",
11388
"name": "python3"
11489
},
@@ -122,7 +97,7 @@
12297
"name": "python",
12398
"nbconvert_exporter": "python",
12499
"pygments_lexer": "ipython3",
125-
"version": "3.8.15 | packaged by conda-forge | (default, Nov 22 2022, 08:49:06) \n[Clang 14.0.6 ]"
100+
"version": "3.12.6"
126101
},
127102
"vscode": {
128103
"interpreter": {

doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ specialized applications can be found in the `CLIMADA Petals
129129

130130
Getting started <getting-started/index>
131131
User Guide <user-guide/index>
132-
Development <development/index>
132+
Developer Guide <development/index>
133133
API Reference <api/index>
134134
About <misc/AUTHORS>
135135
Changelog <misc/CHANGELOG>

0 commit comments

Comments
 (0)