From 18cc4716dfeb27101dd799645e6ed166b69f870e Mon Sep 17 00:00:00 2001 From: "Christopher H.Barker, PhD" Date: Fri, 3 Feb 2023 20:37:30 -0600 Subject: [PATCH 1/4] updated conda section --- source/key_projects.rst | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/source/key_projects.rst b/source/key_projects.rst index 4ffdd6688..81879c0e8 100644 --- a/source/key_projects.rst +++ b/source/key_projects.rst @@ -379,26 +379,31 @@ conda :doc:`Docs ` -conda is the package management tool for `Anaconda -`__ Python installations. -Anaconda Python is a distribution from `Anaconda, Inc +conda is a package, dependency, and environment management system for any language—Python, R, +Ruby, Lua, Scala, Java, JavaScript, C/ C++, Fortran, and more. It is written in Python and +widely used in the Python scientific computing community, due to its support for non-Python +compiled libraries and extensions. It is used as the basis of the `Anaconda +`__ Python distribution from `Anaconda, Inc `__ specifically aimed at the scientific -community, and in particular on Windows where the installation of binary -extensions is often difficult. +community, but can also be used on its own, or with the +`miniconda `_ distribution. It is available +for Windows, Mac and Linux systems. Conda is a completely separate tool from :ref:`pip`, virtualenv and wheel, but provides -many of their combined features in terms of package management, virtual environment -management and deployment of binary extensions. - -Conda does not install packages from PyPI and can install only from -the official Anaconda repositories, or anaconda.org (a place for -user-contributed *conda* packages), or a local (e.g. intranet) package -server. However, note that :ref:`pip` can be installed into, and work -side-by-side with conda for managing :term:`distributions -` from PyPI. Also, `conda skeleton -`__ -is a tool to make Python packages installable by conda by first -fetching them from PyPI and modifying their metadata. +many of their combined features, such as package management, virtual environment +management and deployment of binary extensions and other binary code. + +Conda does not install packages from PyPI -- it can only manage packages built specifically +for conda, which can be made available on a "conda channel", such as those hosted by +`anaconda.org `_ or a local (e.g. intranet) package server. In additon +to the "defults" channel managed by `Anaconda, Inc `_, there are +a wide variety of packages from the community supported +`conda-forge project `__ + +Note that :ref:`pip` can be installed into, and work side-by-side with conda +for managing :term:`distributions ` from PyPI. It is also straightforward +to build conda packages from Python source packages using tools provided by conda. + .. _devpi: From ef6188ae154ae0b83ae581057d201435acbf093c Mon Sep 17 00:00:00 2001 From: "Christopher H.Barker, PhD" Date: Sat, 17 Jun 2023 14:47:35 -0700 Subject: [PATCH 2/4] Update source/key_projects.rst Co-authored-by: chrysle --- source/key_projects.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/key_projects.rst b/source/key_projects.rst index 81879c0e8..8acd13a1c 100644 --- a/source/key_projects.rst +++ b/source/key_projects.rst @@ -386,7 +386,7 @@ compiled libraries and extensions. It is used as the basis of the `Anaconda `__ Python distribution from `Anaconda, Inc `__ specifically aimed at the scientific community, but can also be used on its own, or with the -`miniconda `_ distribution. It is available +:doc:`miniconda ` distribution. It is available for Windows, Mac and Linux systems. Conda is a completely separate tool from :ref:`pip`, virtualenv and wheel, but provides From 79390f0d9f11f048b84d9ef9bdb689dfdea081fd Mon Sep 17 00:00:00 2001 From: "Christopher H.Barker, PhD" Date: Sat, 17 Jun 2023 14:53:01 -0700 Subject: [PATCH 3/4] fixed typo Co-authored-by: chrysle --- source/key_projects.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/key_projects.rst b/source/key_projects.rst index 8acd13a1c..6b7d0e500 100644 --- a/source/key_projects.rst +++ b/source/key_projects.rst @@ -394,9 +394,9 @@ many of their combined features, such as package management, virtual environment management and deployment of binary extensions and other binary code. Conda does not install packages from PyPI -- it can only manage packages built specifically -for conda, which can be made available on a "conda channel", such as those hosted by +for conda, which can be made available on a "conda channel", such as those hosted on `anaconda.org `_ or a local (e.g. intranet) package server. In additon -to the "defults" channel managed by `Anaconda, Inc `_, there are +to the "default" channels managed by `Anaconda, Inc `_, there are a wide variety of packages from the community supported `conda-forge project `__ From 947d2cda65f168329c1749d37819f9262a7bb667 Mon Sep 17 00:00:00 2001 From: "Christopher H.Barker, PhD" Date: Sat, 17 Jun 2023 14:57:15 -0700 Subject: [PATCH 4/4] shorten list of langes supported by conda in key_projects.rst --- source/key_projects.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/key_projects.rst b/source/key_projects.rst index 6b7d0e500..34f64198e 100644 --- a/source/key_projects.rst +++ b/source/key_projects.rst @@ -380,7 +380,7 @@ conda :doc:`Docs ` conda is a package, dependency, and environment management system for any language—Python, R, -Ruby, Lua, Scala, Java, JavaScript, C/ C++, Fortran, and more. It is written in Python and +Ruby, C/C++, Fortran, and more. It is written in Python and widely used in the Python scientific computing community, due to its support for non-Python compiled libraries and extensions. It is used as the basis of the `Anaconda `__ Python distribution from `Anaconda, Inc