From aec6a13821b120a40e2940b34a581cb5a8a19207 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 01:38:37 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/source/miniconda-install.rst | 12 ++++++------ docs/source/miniconda-other-installer-links.rst | 2 -- .../miniconda-other-installer-links.rst.jinja2 | 3 --- docs/source/miniconda-other-resources.rst | 2 +- docs/source/miniconda-system-requirements.rst | 2 +- docs/source/miniconda.rst | 4 ++-- docs/source/miniconda.rst.jinja2 | 5 ++--- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/docs/source/miniconda-install.rst b/docs/source/miniconda-install.rst index f756af1ab..2e52231a2 100644 --- a/docs/source/miniconda-install.rst +++ b/docs/source/miniconda-install.rst @@ -21,8 +21,8 @@ This page contains more complex installation instructions for the major operatin a. Open PowerShell version 4.0 or later. For instructions for using Windows PowerShell 3.0 or older, see the `Cryptographic hash verification `_ instructions in the conda project documentation. b. Run the following command, replacing ``filename`` with the path to your installer. - - .. code-block:: powershell + + .. code-block:: powershell Get-FileHash filename -Algorithm SHA256 @@ -34,7 +34,7 @@ This page contains more complex installation instructions for the major operatin #. Test your installation by running ``conda list``. If conda has been installed correctly, a list of installed packages appears. `More information on installing in silent mode on Windows is in the conda project documentation `_. - + .. tab-item:: macOS graphical installer #. :doc:`Download the installer. ` @@ -48,7 +48,7 @@ This page contains more complex installation instructions for the major operatin shasum -a 256 filename c. Check the hash that appears against the hash listed next to the installer you downloaded. See :doc:`all Miniconda installer hashes here `. - + #. Double-click the ``.pkg`` file. #. Follow the instructions on the screen. If you are unsure about any setting, accept the defaults. You can change them later. #. When the installation finishes, open your terminal application. @@ -57,7 +57,7 @@ This page contains more complex installation instructions for the major operatin `More information on installing in silent mode on macOS is in the conda project documentation `_. .. tab-item:: Linux installer - + #. :doc:`Download the installer. ` #. (Optional) Verify your installer's SHA-256 checksum. This check proves that the installer you downloaded is the original one. @@ -85,4 +85,4 @@ This page contains more complex installation instructions for the major operatin #. Test your installation by running ``conda list``. If conda has been installed correctly, a list of installed packages appears. `For more information on installing in silent mode, see the macOS instructions in the conda project documentation `_. - + diff --git a/docs/source/miniconda-other-installer-links.rst b/docs/source/miniconda-other-installer-links.rst index 447ce5269..4d072c8cf 100644 --- a/docs/source/miniconda-other-installer-links.rst +++ b/docs/source/miniconda-other-installer-links.rst @@ -69,5 +69,3 @@ Linux installers ,`Miniconda3 Linux-aarch64 64-bit `_,72.7 MiB,``cd39b811ac9a2f9094c4dfff9ec0f7ec811d6ad7ede5ab3f1a31d330ab3a2c55`` ,`Miniconda3 Linux-ppc64le 64-bit `_,74.1 MiB,``6fc3bf00d4fe0c724fab884d93b981acbc22bb8fc41c144df6d2fc080ff80e25`` ,`Miniconda3 Linux-s390x 64-bit `_,85.8 MiB,``b840fd5a8474a3e6831cd50a64eadf73239c6ad7deeebf2c3d3fe366220b2722`` - - diff --git a/docs/source/miniconda-other-installer-links.rst.jinja2 b/docs/source/miniconda-other-installer-links.rst.jinja2 index 0c1324f29..46462bbe1 100644 --- a/docs/source/miniconda-other-installer-links.rst.jinja2 +++ b/docs/source/miniconda-other-installer-links.rst.jinja2 @@ -24,6 +24,3 @@ This list of Miniconda installers is for all supported versions of Python, separ {%- endfor -%} {%- endfor %} {%- endfor %} - - - diff --git a/docs/source/miniconda-other-resources.rst b/docs/source/miniconda-other-resources.rst index 462c6d5cb..e641a0f42 100644 --- a/docs/source/miniconda-other-resources.rst +++ b/docs/source/miniconda-other-resources.rst @@ -27,7 +27,7 @@ There are two variants of the installer: Miniconda is Python 2 based, while Mini Which Miniconda is installed only affects the root environment. Regardless of which version of Miniconda you install, you can still use conda to install both Python 2.x and Python 3.x environments. -However, Miniconda3 (the Python 3 version of Miniconda) will default to Python 3 when creating new environments +However, Miniconda3 (the Python 3 version of Miniconda) will default to Python 3 when creating new environments and building packages. For example, take the command below: diff --git a/docs/source/miniconda-system-requirements.rst b/docs/source/miniconda-system-requirements.rst index 1f07ff67a..b00c4f61b 100644 --- a/docs/source/miniconda-system-requirements.rst +++ b/docs/source/miniconda-system-requirements.rst @@ -12,4 +12,4 @@ System requirements On Windows, macOS, and Linux, it is best to install Miniconda for the local user, which does not require administrator permissions and is the most robust type of installation. However, if you need to, you can install Miniconda system wide, -which does require administrator permissions. \ No newline at end of file +which does require administrator permissions. diff --git a/docs/source/miniconda.rst b/docs/source/miniconda.rst index 88c5f24be..b503b0e98 100644 --- a/docs/source/miniconda.rst +++ b/docs/source/miniconda.rst @@ -2,8 +2,8 @@ Miniconda ========= -Miniconda is a free minimal installer for conda. It is a small bootstrap version of Anaconda that includes only conda, Python, the packages they -both depend on, and a small number of other useful packages (like pip, zlib, and a few others). If you need more packages, use the ``conda install`` +Miniconda is a free minimal installer for conda. It is a small bootstrap version of Anaconda that includes only conda, Python, the packages they +both depend on, and a small number of other useful packages (like pip, zlib, and a few others). If you need more packages, use the ``conda install`` command to install from thousands of packages available by default in Anaconda’s public repo, or from other channels, like conda-forge or bioconda. **Is Miniconda the right conda install for you?** The `Anaconda or Miniconda `_ page lists some reasons why you might want one installation over the other. diff --git a/docs/source/miniconda.rst.jinja2 b/docs/source/miniconda.rst.jinja2 index 2cf89f65f..7524c4e2d 100644 --- a/docs/source/miniconda.rst.jinja2 +++ b/docs/source/miniconda.rst.jinja2 @@ -2,8 +2,8 @@ Miniconda ========= -Miniconda is a free minimal installer for conda. It is a small bootstrap version of Anaconda that includes only conda, Python, the packages they -both depend on, and a small number of other useful packages (like pip, zlib, and a few others). If you need more packages, use the ``conda install`` +Miniconda is a free minimal installer for conda. It is a small bootstrap version of Anaconda that includes only conda, Python, the packages they +both depend on, and a small number of other useful packages (like pip, zlib, and a few others). If you need more packages, use the ``conda install`` command to install from thousands of packages available by default in Anaconda’s public repo, or from other channels, like conda-forge or bioconda. **Is Miniconda the right conda install for you?** The `Anaconda or Miniconda `_ page lists some reasons why you might want one installation over the other. @@ -95,4 +95,3 @@ These quick command line instructions will get you set up quickly with the lates ~/miniconda3/bin/conda init bash ~/miniconda3/bin/conda init zsh -