Skip to content

Commit

Permalink
Merge pull request #396 from hakonanes/update-installation-instructions
Browse files Browse the repository at this point in the history
Update installation instructions and add warning
  • Loading branch information
hakonanes authored Jul 8, 2021
2 parents 2786d85 + c65149b commit 969bbbe
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ kikuchipy can be installed from `Anaconda
and supports Python >= 3.7. All alternatives are available on Windows, macOS,
and Linux.

.. _install-with-hyperspy-bundle:

With the HyperSpy Bundle
========================

The easiest way to install kikuchipy is via the HyperSpy Bundle. See
`HyperSpy's documentation
<http://hyperspy.org/hyperspy-doc/current/user_guide/install.html#hyperspy-bundle>`_
for instructions.

.. _install-with-anaconda:

With Anaconda
Expand Down Expand Up @@ -78,6 +68,23 @@ To install a specific version of kikuchipy (say version 0.3.4)::

.. _install-from-source:

.. _install-with-hyperspy-bundle:

With the HyperSpy Bundle
========================

The easiest way to install kikuchipy is via the HyperSpy Bundle. See
`HyperSpy's documentation
<http://hyperspy.org/hyperspy-doc/current/user_guide/install.html#hyperspy-bundle>`_
for instructions.

.. warning::

kikuchipy is updated more frequently than the HyperSpy Bundle, thus the installed
version of kikuchipy will most likely not be the latest version available. See the
`HyperSpy Bundle repository <https://github.com/hyperspy/hyperspy-bundle>`_ for how
to update packages in the bundle.

From source
===========

Expand Down

0 comments on commit 969bbbe

Please sign in to comment.