You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -59,6 +59,7 @@ Removed:
59
59
- Reduce memory requirements of `TropCyclone.from_tracks`[#749](https://github.com/CLIMADA-project/climada_python/pull/749)
60
60
- Support for different wind speed and pressure units in `TCTracks` when running `TropCyclone.from_tracks`[#749](https://github.com/CLIMADA-project/climada_python/pull/749)
61
61
- Changed the parallel package from Pathos to Multiproess in the unsequa module [#763](https://github.com/CLIMADA-project/climada_python/pull/763)
62
+
- Updated installation instructions to use conda for core and petals [#776](https://github.com/CLIMADA-project/climada_python/pull/776)
Copy file name to clipboardExpand all lines: doc/guide/install.rst
+34-16Lines changed: 34 additions & 16 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -37,11 +37,31 @@ Depening on your level of expertise, we provide two different approaches:
37
37
38
38
* If you have never worked with a command line, or if you just want to give CLIMADA a try, follow the :ref:`simple instructions <install-simple>`.
39
39
* If you want to use the very latest development version of CLIMADA or even develop new CLIMADA code, follow the :ref:`advanced instructions <install-advanced>`.
40
-
If you want to install `CLIMADA Petals`_, also follow these.
41
40
42
41
Both approaches are not mutually exclusive.
43
42
After successful installation, you may switch your setup at any time.
44
43
44
+
.. _petals-notes:
45
+
46
+
Notes on the CLIMADA Petals Package
47
+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48
+
49
+
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>`_).
50
+
The Core contains all the modules necessary for probabilistic impact, averted damage, uncertainty and forecast calculations.
51
+
Data for hazard, exposures and impact functions can be obtained from the :doc:`CLIMADA Data API </tutorial/climada_util_api_client>`.
52
+
Hazard and Exposures subclasses are included as demonstrators only.
53
+
54
+
.. attention:: CLIMADA Petals is **not** a standalone module and requires CLIMADA Core to be installed!
55
+
56
+
CLIMADA Petals contains all the modules for generating data (e.g., ``TC_Surge``, ``WildFire``, ``OpenStreeMap``, ...).
57
+
New modules are developed and tested here.
58
+
Some data created with modules from Petals is available to download from the :doc:`Data API </tutorial/climada_util_api_client>`.
59
+
This works with just CLIMADA Core installed.
60
+
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.
61
+
62
+
Both :ref:`installation approaches <install-choice>` mentioned above support CLIMADA Petals.
63
+
If you are unsure whether you need Petals, you can install the Core first and later add Petals in both approaches.
64
+
45
65
.. _install-simple:
46
66
47
67
-------------------
@@ -77,6 +97,12 @@ These instructions will install the most recent stable version of CLIMADA withou
77
97
In the end, you should see an "Ok".
78
98
If so, great! You are good to go.
79
99
100
+
#. *Optional:* Install CLIMADA Petals into the environment:
@@ -191,18 +217,7 @@ Instructions for running the test scripts can be found in the :doc:`Testing and
191
217
Install CLIMADA Petals (Optional)
192
218
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
193
219
194
-
CLIMADA is divided into two repositories, CLIMADA Core (`climada_python <https://github.com/CLIMADA-project/climada_python>`_) and CLIMADA Petals (`climada_petals <https://github.com/CLIMADA-project/climada_petals>`_).
195
-
The Core contains all the modules necessary for probabilistic impact, averted damage, uncertainty and forecast calculations.
196
-
Data for hazard, exposures and impact functions can be obtained from the :doc:`CLIMADA Data API </tutorial/climada_util_api_client>`.
197
-
Hazard and Exposures subclasses are included as demonstrators only.
198
-
199
-
.. attention:: CLIMADA Petals is **not** a standalone module and requires CLIMADA Core to be installed!
200
-
201
-
CLIMADA Petals contains all the modules for generating data (e.g., ``TC_Surge``, ``WildFire``, ``OpenStreeMap``, ...).
202
-
New modules are developed and tested here.
203
-
Some data created with modules from Petals is available to download from the :doc:`Data API </tutorial/climada_util_api_client>`.
204
-
This works with just CLIMADA Core installed.
205
-
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.
220
+
If you are unsure whether you need Petals, see the :ref:`notes above <petals-notes>`.
206
221
207
222
To install CLIMADA Petals, we assume you have already installed CLIMADA Core with the :ref:`advanced instructions <install-advanced>` above.
208
223
@@ -294,13 +309,16 @@ For further information, refer to the VSCode docs on `Workspaces <https://code.v
294
309
Test Explorer Setup
295
310
"""""""""""""""""""
296
311
297
-
After you set up a workspace, you might want to configure the test explorer for easily running the CLIMADA test suite within VSCode:
312
+
After you set up a workspace, you might want to configure the test explorer for easily running the CLIMADA test suite within VSCode.
313
+
314
+
.. note:: Please install the additional :ref:`test dependencies <install-dev>` before proceeding.
298
315
299
316
#. In the left sidebar, select the "Testing" symbol, and click on *Configure Python Tests*.
300
317
301
-
#. Select "unittest" as test framework and then select the ``test*`` pattern for test discovery.
318
+
#. Select "pytest" as test framework and then select ``climada`` as the directory containing the test files.
302
319
303
-
#. The "Test Explorer" will display the tree structure of modules, files, test classes and individuals tests.
320
+
#. Select "Testing" in the Activity Bar on the left or through *View* > *Testing*.
321
+
The "Test Explorer" in the left sidebar will display the tree structure of modules, files, test classes and individual tests.
304
322
You can run individual tests or test subtrees by clicking the Play buttons next to them.
305
323
306
324
#. By default, the test explorer will show test output for failed tests when you click on them.
0 commit comments