Skip to content

Commit f62b5b5

Browse files
reworked intro paragraph to address duplicate links, and cleaner entry
into conda vs. Anaconda.
1 parent e0c0e7a commit f62b5b5

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

source/guides/installing-scientific-packages.rst

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In particular, `NumPy <https://numpy.org/>`__, which provides the basis
1414
for most of the software in the `scientific Python stack
1515
<https://scientific-python.org>`_ can be configured
1616
to interoperate with different FORTRAN libraries, and can take advantage
17-
of different levels of vectorised instructions available in modern CPUs.
17+
of different levels of vectorized instructions available in modern CPUs.
1818

1919
Starting with version 1.10.4 of NumPy and version 1.0.0 of SciPy, pre-built
2020
32-bit and 64-bit binaries in the ``wheel`` format are available for all major
@@ -118,26 +118,22 @@ be loaded and unloaded from the user's environment.
118118
The conda cross-platform package manager
119119
----------------------------------------
120120

121-
`Anaconda <https://www.anaconda.com/products/individual/>`_ is a Python distribution
122-
published by Anaconda, Inc. It is a stable collection of Open Source
123-
packages for big data and scientific use. As of the 5.0 release of Anaconda,
124-
about 200 packages are installed by default, and a total of 400-500 can be
125-
installed and updated from the Anaconda repository.
126-
127121
``conda`` is an open source (BSD licensed) package management system and
128-
environment management system included in Anaconda that allows users to install
122+
environment management system that allows users to install
129123
multiple versions of binary software packages and their dependencies, and
130124
easily switch between them. It is a cross-platform tool working on Windows,
131-
macOS, and Linux. Conda can be used to package up and distribute all kinds of
125+
MacOS, and Linux. Conda can be used to package up and distribute all kinds of
132126
packages, it is not limited to just Python packages. It has full support for
133127
native virtual environments. Conda makes environments first-class citizens,
134128
making it easy to create independent environments even for C libraries. It is
135129
written in Python, but is Python-agnostic. Conda manages Python itself as a
136130
package, so that :command:`conda update python` is possible, in contrast to
137131
pip, which only manages Python packages.
138132

139-
The conda package manager is available in `Anaconda <https://docs.anaconda.com/anaconda/>`_, `miniconda <https://docs.anaconda.com/miniconda/>`_, `miniforge <https://github.com/conda-forge/miniforge>`_, and `pixi <https://pixi.sh/>`_.
133+
Anaconda `Anaconda <https://docs.anaconda.com/anaconda/>`_ is a Python distribution published by Anaconda, Inc. It is a stable collection of Open Source packages for big data and scientific use, and a collection of Graphical Interface utilities for managing conda environments.
134+
135+
In addition to the full distribution provided by Anaconda, the conda package manager itself is available in `miniconda <https://docs.anaconda.com/miniconda/>`_, `miniforge <https://github.com/conda-forge/miniforge>`_, and `pixi <https://pixi.sh/>`_.
136+
140137

141138
Conda packages are available on multiple channels on Anaconda.org, including the
142-
default channel supported by Anaconda, Inc, and the community supported conda-forge
143-
channel, which provides a wide variety of pre-built packages.
139+
default channel supported by Anaconda, Inc, the community supported conda-forge channel, which provides a wide variety of pre-built packages, and some domain-specific package collections.

0 commit comments

Comments
 (0)