Skip to content

Commit

Permalink
Update docs to default py36 (#337)
Browse files Browse the repository at this point in the history
* Initial commit with CHANGELOG.rst

* Change python 3.6 as the default version in docs
  • Loading branch information
hpesonen authored Oct 8, 2020
1 parent 3276381 commit 5f05076
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changelog
=========

- Update documentation to setting python 3.6 as default
- Add dask support to elfi client options
- Add python 3.7 to travis tests and remove python 3.5 due to clash with dask
- Modify progress bar to better indicate ABC-SMC inference status
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `ELFI` for local development.
environment. You may need to replace "3.5" in the first line with the python
version printed in the previous step::

$ conda create -n elfi python=3.5 numpy
$ conda create -n elfi python=3.6 numpy
$ source activate elfi
$ cd elfi
$ make dev
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ is preferable.
Installation
------------

ELFI requires Python 3.5 or greater. You can install ELFI by typing in your terminal:
ELFI requires Python 3.6 or greater. You can install ELFI by typing in your terminal:

```
pip install elfi
Expand Down Expand Up @@ -70,7 +70,7 @@ with your default Python environment and can easily use different versions of Py
in different projects. You can create a virtual environment for ELFI using anaconda with:

```
conda create -n elfi python=3.5 numpy
conda create -n elfi python=3.6 numpy
source activate elfi
pip install elfi
```
Expand Down
10 changes: 5 additions & 5 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Installation
============

ELFI requires Python 3.5 or greater (see below how to install). To install ELFI, simply
ELFI requires Python 3.6 or greater (see below how to install). To install ELFI, simply
type in your terminal:

.. code-block:: console
Expand All @@ -18,16 +18,16 @@ process.
.. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/


Installing Python 3.5
Installing Python 3.6
---------------------

If you are new to Python, perhaps the simplest way to install it is with Anaconda_ that
manages different Python versions. After installing Anaconda, you can create a Python 3.5.
manages different Python versions. After installing Anaconda, you can create a Python 3.6.
environment with ELFI:

.. code-block:: console
conda create -n elfi python=3.5 numpy
conda create -n elfi python=3.6 numpy
source activate elfi
pip install elfi
Expand All @@ -51,7 +51,7 @@ Resolving these may sometimes go wrong:
* If you receive an error about missing ``numpy``, please install it first.
* If you receive an error about `yaml.load`, install ``pyyaml``.
* On OS X with Anaconda virtual environment say `conda install python.app` and then use `pythonw` instead of `python`.
* Note that ELFI requires Python 3.5 or greater
* Note that ELFI requires Python 3.6 or greater
* In some environments ``pip`` refers to Python 2.x, and you have to use ``pip3`` to use the Python 3.x version
* Make sure your Python installation meets the versions listed in requirements_.

Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Quickstart

First ensure you have
`installed <http://elfi.readthedocs.io/en/stable/installation.html>`__
Python 3.5 (or greater) and ELFI. After installation you can start using
Python 3.6 (or greater) and ELFI. After installation you can start using
ELFI:

.. code:: ipython3
Expand Down

0 comments on commit 5f05076

Please sign in to comment.