Skip to content

Commit

Permalink
Update python version in installation instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
brynpickering committed Jan 15, 2020
1 parent 95155e7 commit 148ee39
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

---

Expand All @@ -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).

Expand Down
6 changes: 3 additions & 3 deletions doc/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <python_module_requirements>`).
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.
Expand All @@ -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 <https://conda.io/miniconda.html>`_ (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

Expand Down

0 comments on commit 148ee39

Please sign in to comment.