Skip to content

Commit 1b292df

Browse files
committed
pixi docs
1 parent 8ee05e5 commit 1b292df

File tree

3 files changed

+19
-44
lines changed

3 files changed

+19
-44
lines changed

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,21 @@ histogram data object
1717
2. Go to a location where you would like to install histogram, run:
1818

1919
```bash
20-
git clone https://github.com/neutrons/histogram-dev.git`
20+
git clone https://github.com/neutrons/histogram-dev.git
2121

2222
```
2323

24-
3. Setup/Update the environment
24+
3. Setup-activate and enter the environment
2525

2626
```bash
27-
pixi install
27+
pixi shell
2828
```
2929

3030
The histogram environment is activated and the application is ready to use.
3131

3232

3333
## For Contributors
3434

35-
**Development/Deployment**
36-
37-
---
3835

3936
* Pixi additional Information
4037

@@ -46,10 +43,10 @@ The histogram environment is activated and the application is ready to use.
4643
4744
```
4845

49-
to enter the environment
46+
to install/update the enrivornment
5047

5148
```bash
52-
pixi shell
49+
pixi install
5350
5451
```
5552

docs/sphinx/install-details.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,3 @@ Optionally, you may want to install:
1717

1818
* `h5py <http://code.google.com/p/h5py/>`_: for load/dump histograms
1919
* `matplotlib <http://matplotlib.sourceforge.net/>`_: for plotting
20-
21-
22-
Install
23-
-------
24-
The histogram package can be installed by using pip install in editable mode currently::
25-
26-
$ git clone git@github.com:neutrons/histogram-dev.git.
27-
28-
Navigate to the root directory of histogram-dev:::
29-
30-
$ conda env create
31-
32-
(This will create an environment using the environment.yml file.)
33-
34-
To install the package, in the correct environment(histogram-dev)::
35-
36-
$ pip install -e .

docs/sphinx/install.rst

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,38 @@
33
Installation
44
============
55

6-
The histogram package can be installed:
6+
The histogram package can be installed with 2 ways:
77

8-
1. from the source code:
8+
* from the source code:
99

10-
1. Install [Pixi](https://pixi.sh/) for managing environments, dependencies, packaging, and task execution. (if it is not already installed).
10+
1. Install `Pixi <https://pixi.sh/>`_ for managing environments, dependencies, packaging, and task execution. (if it is not already installed).
1111

1212
Pixi installation e.g. for Linux:
1313

14-
```bash
14+
.. code:: shell
1515
16-
curl -fsSL https://pixi.sh/install.sh | sh
16+
$ curl -fsSL https://pixi.sh/install.sh | sh
1717
18-
```
19-
Also install git, if it is missing.
2018
21-
2. Go to a location where you would like to install the program (e.g., $HOME/software), run:
19+
Also install git, if it is missing.
2220

21+
2. Go to a location where you would like to install the program, run:
2322

24-
`git clone https://github.com/neutrons/histogram-dev.git`
23+
.. code:: shell
2524
26-
3. Setup/Update the environment
25+
$ git clone https://github.com/neutrons/histogram-dev.git
2726
28-
```bash
29-
pixi install
30-
```
27+
3. Setup and enter the environment
3128

32-
or to enter the environment
29+
.. code:: shell
3330
34-
```bash
35-
pixi shell
31+
$ pixi shell
3632
37-
```
38-
2. as a conda package: https://anaconda.org/neutrons/histogram
33+
* as a conda package: `Histogram Package Installation Instructions <https://anaconda.org/neutrons/histogram>`_
3934

4035

4136
To test, in the root directory type:
4237

4338
pytest
4439

45-
:ref:`More details <install-details>`
40+
:ref:`Additional details <install-details>`

0 commit comments

Comments
 (0)