diff --git a/README.md b/README.md index 114206a2f..22601e967 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,14 @@ ## Contents -* [About](#about) -* [Quick start](#quick-start) -* [Documentation](#documentation) -* [Contributing](#contributing) -* [What's new](#whats-new) -* [Citing Calliope](#citing-calliope) -* [License](#license) +- [Contents](#contents) +- [About](#about) +- [Quick start](#quick-start) +- [Documentation](#documentation) +- [Contributing](#contributing) +- [What's new](#whats-new) +- [Citing Calliope](#citing-calliope) +- [License](#license) --- @@ -36,7 +37,7 @@ Calliope comes with several built-in analysis and visualisation tools. Having so ## Quick start -Calliope can run on Windows, macOS and Linux. Installing it is quickest with the `conda` package manager by running a single command: `conda create -c conda-forge -n calliope python=3.6 calliope`. +Calliope can run on Windows, macOS and Linux. Installing it is quickest with the `conda` package manager by running a single command: `conda create -c conda-forge -n calliope calliope`. See the documentation for more [information on installing](https://calliope.readthedocs.io/en/stable/user/installation.html). diff --git a/doc/user/installation.rst b/doc/user/installation.rst index 8a95ab0e6..650b23bd6 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -11,7 +11,7 @@ Calliope has been tested on Linux, macOS, and Windows. Running Calliope requires four things: -1. The Python programming language, version 3.6 or higher. +1. The Python programming language, version 3.7 or higher. 2. A number of Python add-on modules (see :ref:`below for the complete list `). 3. A solver: Calliope has been tested with CBC, GLPK, Gurobi, and CPLEX. Any other solver that is compatible with Pyomo should also work. 4. The Calliope software itself. @@ -23,11 +23,11 @@ The easiest way to get a working Calliope installation is to use the free ``cond To get ``conda``, `download and install the "Miniconda" distribution for your operating system `_ (using the version for Python 3). -With Miniconda installed, you can create a new Python 3.6 environment called ``"calliope"`` with all the necessary modules, including the free and open source GLPK solver, by running the following command in a terminal or command-line window +With Miniconda installed, you can create a new environment called ``"calliope"`` with all the necessary modules, including the free and open source GLPK solver, by running the following command in a terminal or command-line window .. code-block:: fishshell - $ conda create -c conda-forge -n calliope python=3.6 calliope + $ conda create -c conda-forge -n calliope calliope To use Calliope, you need to activate the ``calliope`` environment each time