Skip to content

Commit c704f90

Browse files
author
Daan van Vugt
committed
setup instructions
1 parent e032d3b commit c704f90

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Integrated Modelling & Analysis Suite (IMAS) Data Model.
77

88
It provides:
99
* An easy-to-install and easy-to-get started package by
10-
* Not requiring an IMAS installation
10+
* Not requiring an IMAS installation
1111
* Not strictly requiring matching a Data Dictionary (DD) version
1212
* An pythonic alternative to the IMAS Python High Level Interface (HLI)
1313
* Checking of correctness on assign time, instead of database write time
@@ -26,7 +26,7 @@ and can be found at the [ITER sharepoint](https://sharepoint.iter.org/department
2626

2727
IMASPy is a standalone python package with optional dependencies. All needed
2828
python packages can be found in `requirements.txt`, and should all be publicly
29-
available. A simple `pip install` should take care of everything.
29+
available. A simple `pip install -r requirements.txt` should take care of everything.
3030

3131
#### Being IMAS DD compatible
3232

docs/source/installing.rst

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IMASPy also needs the :al_lib:`IMAS Python helper functions <browse>`. Currently
1010
dependencies are pulled it using :std:doc:`GitPython <gitpython:index>`, until the
1111
:issue:`separate Python HLI parts are available as packages <IMAS-584>`.
1212

13-
.. :std:doc:`Cython <cython:index>` of the
13+
.. :std:doc:`Cython <cython:index>` of the
1414
1515
1616
Python is very flexible, and so is it's install procedure. This is a double-edged sword:
@@ -20,13 +20,12 @@ community. For an introduction to the topic, read the
2020

2121
Installing on the ITER cluster
2222
------------------------------
23-
We assume a clean system. To interact with the AL, we need the IMAS environment
23+
To interact with the AL, we need the IMAS environment
2424
activated. I'm assuming a bash shell for all these commands:
2525

2626
.. code-block:: bash
2727
28-
module load AL-Python-lib
29-
module load AL-Cython
28+
module load IMAS-2020a/3.30.0-4.8.5-2020a
3029
3130
This should give us all we need, namely at time of testing:
3231

@@ -38,14 +37,18 @@ We are all developers, let's install in [pip editable](https://pip.pypa.io/en/st
3837

3938
.. code-block:: bash
4039
41-
git clone git@gitlab.com:klimex/imaspy.git
42-
pip install --user -e imaspy[backends_al,backends_xarray,test]
40+
git clone git@git.iter.org/IMAS/imaspy.git
41+
pip install --user -e imaspy
4342
4443
45-
We should now be able to run the examples
44+
We should now be able to run the tests
4645

4746
.. code-block:: bash
48-
python imaspy/examples/read_write_nbi.py
47+
pip install --user -r requirements_test.txt
48+
pytest imaspy/ --mini
49+
50+
Note that at the time of writing access layer version 4.8.5 has an issue which causes
51+
several tests to fail.
4952

5053
Develop install
5154
^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)