Skip to content

Commit b6ba5e8

Browse files
Merge pull request #385 from scipp/frontpage
2 parents 47ba5e2 + 11f06fc commit b6ba5e8

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

docs/getting-started/installation.rst

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ To create a new conda environment with scippneutron:
5050
5151
$ conda create -n env_with_scipp -c conda-forge -c scipp -c ess-dmsc scippneutron
5252
53-
For a more up-to-date version, the `scipp/label/dev` channel can be used instead:
54-
55-
.. code-block:: sh
56-
57-
$ conda install -c conda-forge -c scipp/label/dev -c ess-dmsc scippneutron
58-
5953
.. note::
6054
Instaling ``scippneutron`` on Windows requires ``Microsoft Visual Studio 2019 C++ Runtime`` (and versions above) installed.
6155
Visit https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads for the up to date version of the library.
@@ -91,3 +85,16 @@ This is due to some dependencies being too old to work in the same environment a
9185
Please follow the steps on the `Windows Subsystem for Linux Installation Guide page <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`_
9286
to enable Linux support.
9387
Once ``WSL 1`` is installed, setting up Scipp with Mantid follows the Linux specific directions described above.
88+
89+
Pip
90+
---
91+
92+
ScippNeutron is available from `PyPI <https://pypi.org/>`_ via ``pip``:
93+
94+
.. code-block:: sh
95+
96+
pip install scippneutron
97+
98+
Note that Mantid is not available via ``pip``.
99+
If you depend on it, you will need to install it separately.
100+
We recommending installation of ScippNeutron via ``conda`` in this case (see above).

docs/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scippneutron - Neutron scattering data processing based on scipp
1+
ScippNeutron - Neutron scattering data processing based on Scipp
22
================================================================
33

44
Toolkit for neutron scattering data reduction powered by `scipp <https://scipp.github.io/>`_.
@@ -9,8 +9,8 @@ News
99

1010
- [|SCIPPNEUTRON_RELEASE_MONTH|] scippneutron-|SCIPPNEUTRON_VERSION| `has been released <about/release-notes.rst>`_.
1111
Check out the `What's new <about/whats-new.rst>`_ notebook for an overview of recent highlights and major changes.
12-
- [January 2022] `scipp-0.11 <https://scipp.github.io/about/release-notes.html#v0-11-0-january-2022>`_ has been released.
13-
- Just like scipp, scippneutron has switched from GPLv3 to the more permissive BSD-3 license which fits better into the Python eco system.
12+
- [December 2022] ScippNeutron is now also available on PyPI.
13+
See the updated ``pip`` `installation instructions <getting-started/installation.rst#Pip>`_.
1414

1515
Where can I get help?
1616
---------------------

0 commit comments

Comments
 (0)