Skip to content

Commit 2750a7c

Browse files
committed
Merge pull request pypa#73 from cjrh/conda_description
Updated the conda description to refer to features related to packaging.
2 parents f783b34 + c942130 commit 2750a7c

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

source/projects.rst

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,22 @@ conda
203203

204204
`Docs <http://docs.continuum.io/conda/index.html>`__
205205

206-
conda is an installation tool for managing `Anaconda
207-
<http://docs.continuum.io/anaconda/index.html>`__ installations. Anaconda is a
208-
collection of powerful packages for Python that enables large-scale data
209-
management, analysis, and visualization for Business Intelligence, Scientific
210-
Analysis, Engineering, Machine Learning, and more.
206+
conda is the package management tool for `Anaconda
207+
<http://docs.continuum.io/anaconda/index.html>`__ Python installations.
208+
Anaconda Python is a distribution from `Continuum Analytics
209+
<http://continuum.io/downloads>`__ specifically aimed at the scientific
210+
community, and in particular on Windows where the installation of binary
211+
extensions is often difficuly.
212+
213+
Conda is a completely separate tool to pip, virtualenv and wheel, but provides
214+
many of their combined features in terms of package management, virtual environment
215+
management and deployment of binary extensions.
216+
217+
Conda does not install packages from PyPI and can install only from
218+
the official Continuum repositories, or binstar.org (a place for
219+
user-contributed *conda* packages), or a local (e.g. intranet) package server.
220+
However, note that pip can be installed into, and work side-by-side with conda
221+
for managing packages from PyPI.
211222

212223

213224
.. _hashdist:

0 commit comments

Comments
 (0)