Skip to content

Commit 400eb73

Browse files
committed
wip on urls
1 parent b442167 commit 400eb73

File tree

7 files changed

+28
-22
lines changed

7 files changed

+28
-22
lines changed

doc/development/Guide_CLIMADA_conventions.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
" - Contact a [repository admin](https://github.com/CLIMADA-project/climada_python/wiki/Developer-Board) to get permission\n",
5050
" - Open an [issue](https://github.com/CLIMADA-project/climada_python/issues)\n",
5151
" \n",
52-
"Hence, first try to solve your problem with the standard library and function/methods already implemented in CLIMADA (see in particular the [utility functions](#Utility-functions)) then use the packages included in CLIMADA, and if this is not enough, propose the addition of a new package. Do not hesitate to propose new packages if this is needed for your work!"
52+
"Hence, first try to solve your problem with the standard library and function/methods already implemented in CLIMADA then use the packages included in CLIMADA, and if this is not enough, propose the addition of a new package. Do not hesitate to propose new packages if this is needed for your work!"
5353
]
5454
},
5555
{

doc/development/Guide_Euler.ipynb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"\n",
1515
"## Access to Euler\n",
1616
"\n",
17-
"See https://scicomp.ethz.ch/wiki/Getting_started_with_clusters for details on how to register at and get started with Euler.\n",
17+
"See [this page](https://scicomp.ethz.ch/wiki/Getting_started_with_clusters) for details on how to register at and get started with Euler.\n",
1818
"\n",
1919
"For all steps below, first enter the Cluster via SSH."
2020
]
@@ -28,7 +28,7 @@
2828
"\n",
2929
"## Installation and working directories\n",
3030
"\n",
31-
"Please, get familiar with the various Euler storage options: https://scicomp.ethz.ch/wiki/Storage_systems.<br>\n",
31+
"Please, get familiar with the various [Euler storage options](https://scicomp.ethz.ch/wiki/Storage_systems).<br>\n",
3232
"As a general rule: use `/cluster/project` for installation and `/cluster/work` for data processing.\n",
3333
"\n",
3434
"For ETH WCR group members, the suggested installation and working directories are `/cluster/project/climate/$USER` and `/cluster/work/climate/$USER` respectively.<br>\n",
@@ -137,8 +137,7 @@
137137
"cell_type": "markdown",
138138
"metadata": {},
139139
"source": [
140-
"\n",
141-
"### 1. Load dependencies \n",
140+
"### 1. Load dependencies\n",
142141
"\n",
143142
"See [Load dependencies](#load-dependencies) above."
144143
]

doc/development/Guide_Review.ipynb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"At least one reviewer needs to\n",
4040
"- Review all the changes in the pull request. Read what it's supposed to do, check it does that, and make sure the logic is sound.\n",
4141
"- Check that the code follows the CLIMADA style guidelines \n",
42-
"- [CLIMADA coding conventions](../guide/Guide_CLIMADA_conventions.ipynb) \n",
43-
"- [Python Dos and Don't](../guide/Guide_PythonDos-n-Donts.ipynb) \n",
44-
" - [Python performance tips and best practice for CLIMADA developers](../guide/Guide_Py_Performance.ipynb) \n",
42+
"- [CLIMADA coding conventions](../development/Guide_CLIMADA_conventions.ipynb) \n",
43+
"- [Python Dos and Don't](../development/Guide_PythonDos-n-Donts.ipynb) \n",
44+
"- [Python performance tips and best practice for CLIMADA developers](../development/Guide_Py_Performance.ipynb) \n",
4545
"- If the code is implementing an algorithm it should be referenced in the documentation. Check it's implemented correctly.\n",
4646
"- Try to think of edge cases and ways the code could break. See if there's appropriate error handling in cases where the function might behave unexpectedly.\n",
4747
"- (Optional) suggest easy ways to speed up the code, and more elegant ways to achieve the same goal.\n",
@@ -126,10 +126,14 @@
126126
}
127127
],
128128
"metadata": {
129+
"kernelspec": {
130+
"display_name": "",
131+
"name": ""
132+
},
129133
"language_info": {
130134
"name": "python"
131135
}
132136
},
133137
"nbformat": 4,
134-
"nbformat_minor": 2
138+
"nbformat_minor": 4
135139
}

doc/development/Guide_Testing.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
"## Testing CLIMADA\n",
288288
"\n",
289289
"Executing the entire test suite requires you to install the additional requirements for testing.\n",
290-
"See the [installation instructions](install.rst) for [developer dependencies](install-dev) for further information.\n",
290+
"See the [installation instructions for developer dependencies](../getting-started/install.rst#advanced-instructions) for further information.\n",
291291
"\n",
292292
"In general, you execute tests with\n",
293293
"```\n",
@@ -334,7 +334,7 @@
334334
],
335335
"metadata": {
336336
"kernelspec": {
337-
"display_name": "climada_py38",
337+
"display_name": "Python 3 (ipykernel)",
338338
"language": "python",
339339
"name": "python3"
340340
},
@@ -348,7 +348,7 @@
348348
"name": "python",
349349
"nbconvert_exporter": "python",
350350
"pygments_lexer": "ipython3",
351-
"version": "3.8.15"
351+
"version": "3.12.6"
352352
},
353353
"vscode": {
354354
"interpreter": {

doc/development/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
Development with Git <dev-git>
1010
Coding in python <coding-in-python>
1111
CLIMADA Coding Conventions <Guide_CLIMADA_conventions>
12+
CLIMADA Configuration convention <Guide_Configuration>
1213
Documenting your code <write-documentation>
1314
Writing tests for your code <Guide_Testing>
1415
Guide_Review

doc/getting-started/Guide_get_started.ipynb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"metadata": {},
1515
"source": [
1616
"This is a short summary of the guides to help you find the information that you need to get started.\n",
17-
"To learn more about CLIMADA, have a look at the [introduction](../guide/Guide_Introduction.ipynb). You can also have a look at the paper [repository](https://github.com/CLIMADA-project/climada_papers) to get an overview of research projects."
17+
"To learn more about CLIMADA, have a look at the [introduction](../getting-started/Guide_Introduction.ipynb). You can also have a look at the paper [repository](https://github.com/CLIMADA-project/climada_papers) to get an overview of research projects."
1818
]
1919
},
2020
{
@@ -24,13 +24,15 @@
2424
"metadata": {},
2525
"source": [
2626
"## Installation\n",
27+
"\n",
2728
"The first step to getting started is installing CLIMADA. To do so you will need:\n",
29+
"\n",
2830
"1. To get the lastest release from the git repository [CLIMADA releases](https://github.com/climada-project/climada_python/releases) or clone the project with git if you are interested in contributing to the development.\n",
29-
"2. To build a conda environment with the dependencies needed by CLIMADA. \n",
31+
"2. To build a conda environment with the dependencies needed by CLIMADA.\n",
3032
"\n",
31-
"For details see the [Installation Instructions](install.rst).\n",
33+
"For details see the [Installation Instructions](../getting-started/install.rst).\n",
3234
"\n",
33-
"If you need to run a model on a computational cluster, have a look at [this guide](Guide_Euler.ipynb) to install CLIMADA and run your jobs."
35+
"If you need to run a model on a computational cluster, have a look at [this guide](../development/Guide_Euler.ipynb) to install CLIMADA and run your jobs."
3436
]
3537
},
3638
{
@@ -39,7 +41,7 @@
3941
"metadata": {},
4042
"source": [
4143
"## Programming in Python\n",
42-
"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."
44+
"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](../getting-started/0_intro_python.ipynb). Also have a look at the python [Python Dos and Don't](../development/Guide_PythonDos-n-Donts.ipynb) guide and at the [Python Performance Guide](../development/Guide_Py_Performance.ipynb) for best practice tips."
4345
]
4446
},
4547
{
@@ -48,7 +50,7 @@
4850
"metadata": {},
4951
"source": [
5052
"## Tutorials\n",
51-
"A good way to start using CLIMADA is to have a look at the [Tutorials](https://github.com/CLIMADA-project/climada_python/tree/main/doc/tutorial). The [Main Tutorial](../tutorial/1_main_climada.ipynb) will introduce you the structure of CLIMADA and how to calculate you first impacts, as well as your first appraisal of adaptation options. You can then look at the specific tutorials for each module (for example if you are interested in a specific hazard, like [Tropical Cyclones](../tutorial/climada_hazard_TropCyclone.ipynb), or in learning to [estimate the value of asset exposure](../tutorial/climada_entity_LitPop.ipynb),...). "
53+
"A good way to start using CLIMADA is to have a look at the [Tutorials](../user-guide/index.rst). The [10 minute climada](../user-guide/0_10min_climada.ipynb) tutorial will give you a quick introduction to CLIMADA, with a brief example on how to calculate you first impacts, as well as your first appraisal of adaptation options, while the [Overview](../user-guide/1_main_climada.ipynb) will present the whole structure of CLIMADA more in depth. You can then look at the specific tutorials for each module (for example if you are interested in a specific hazard, like [Tropical Cyclones](../user-guide/climada_hazard_TropCyclone.ipynb), or in learning to [estimate the value of asset exposure](../user-guide/climada_entity_LitPop.ipynb),...). "
5254
]
5355
},
5456
{
@@ -67,7 +69,7 @@
6769
"metadata": {},
6870
"source": [
6971
"## Contributing\n",
70-
"If you would like to participate in the development of CLIMADA, carefully read the [Git and Development Guide](../guide/Guide_Git_Development.ipynb). Before making a new feature, discuss with one of the repository admins (Now Chahan, Emmanuel and David). Every new feature or enhancement should be done on a separate branch, which will be merged in the develop branch after being reviewed (see [Checklist](../guide/Guide_Review.ipynb)). Finally, the develop branch is merged in the main branch in each CLIMADA release. Each new feature should come with a tutorial and with [Unit and Integration Tests](../guide/Guide_Testing.ipynb). "
72+
"If you would like to participate in the development of CLIMADA, carefully read the [Git and Development Guide](../development/Guide_Git_Development.ipynb). Before making a new feature, discuss with one of the repository admins (Now Chahan, Emmanuel and David). Every new feature or enhancement should be done on a separate branch, which will be merged in the develop branch after being reviewed (see [Checklist](../development/Guide_Review.ipynb)). Finally, the develop branch is merged in the main branch in each CLIMADA release. Each new feature should come with a tutorial and with [Unit and Integration Tests](../development/Guide_Testing.ipynb). "
7173
]
7274
},
7375
{

doc/getting-started/install.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ Notes on the CLIMADA Petals Package
6464

6565
CLIMADA is divided into two packages, CLIMADA Core (`climada_python <https://github.com/CLIMADA-project/climada_python>`_) and CLIMADA Petals (`climada_petals <https://github.com/CLIMADA-project/climada_petals>`_).
6666
The Core contains all the modules necessary for probabilistic impact, averted damage, uncertainty and forecast calculations.
67-
Data for hazard, exposures and impact functions can be obtained from the :doc:`CLIMADA Data API </tutorial/climada_util_api_client>`.
67+
Data for hazard, exposures and impact functions can be obtained from the :doc:`CLIMADA Data API </user-guide/climada_util_api_client>`.
6868
Hazard and Exposures subclasses are included as demonstrators only.
6969

7070
.. attention:: CLIMADA Petals is **not** a standalone module and requires CLIMADA Core to be installed!
7171

7272
CLIMADA Petals contains all the modules for generating data (e.g., ``TC_Surge``, ``WildFire``, ``OpenStreeMap``, ...).
7373
New modules are developed and tested here.
74-
Some data created with modules from Petals is available to download from the :doc:`Data API </tutorial/climada_util_api_client>`.
74+
Some data created with modules from Petals is available to download from the :doc:`Data API </user-guide/climada_util_api_client>`.
7575
This works with just CLIMADA Core installed.
7676
CLIMADA Petals can be used to generate additional data of this type, or to have a look at the tutorials for all data types available from the API.
7777

@@ -263,7 +263,7 @@ With the ``climada_env`` activated, execute
263263
264264
pre-commit install
265265
266-
Please refer to the :ref:`guide on pre-commit hooks <guide-pre-commit-hooks>` for information on how to use this tool.
266+
Please refer to the :ref:`pre-commit-hooks` for information on how to use this tool.
267267

268268
For executing the pre-defined test scripts in exactly the same way as they are executed by the automated CI pipeline, you will need ``make`` to be installed.
269269
On macOS and on Linux it is pre-installed. On Windows, it can easily be installed with Conda:

0 commit comments

Comments
 (0)