diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3ac6b4e3..24a3face 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,8 +4,9 @@ Changelog dev --- -- Furhther performance improvements for rerunning inference using stored data via caches +- Further performance improvements for rerunning inference using stored data via caches - Added the general Gaussian noise example model (fixed covariance) +- restrict NetworkX to versions < 2.0 0.6.2 (2017-09-06) ------------------ diff --git a/README.md b/README.md index 1a990bba..b4e13611 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ **Version 0.6.2 released!** See the CHANGELOG and [notebooks](https://github.com/elfi-dev/notebooks). +**NOTE:** For the time being NetworkX 2 is incompatible with ELFI. + ELFI - Engine for Likelihood-Free Inference =========================================== @@ -80,6 +82,7 @@ Resolving these may sometimes go wrong: - 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 so try `pip3 install elfi`. +- Make sure your Python installation meets the versions listed in `requirements.txt`. Citation diff --git a/docs/installation.rst b/docs/installation.rst index a4ae1ec7..bd5e6b73 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -53,6 +53,9 @@ Resolving these may sometimes go wrong: * 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 * 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_. + +.. _requirements: https://github.com/elfi-dev/elfi/blob/dev/requirements.txt Developer installation from sources ----------------------------------- diff --git a/requirements.txt b/requirements.txt index e1fe765a..113bf97c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ numpy>=1.12.1 scipy>=0.19 matplotlib>=1.1 GPy>=1.0.9 -networkX>=1.11 +networkX>=1.11,<2.0 ipyparallel>=6 toolz>=0.8 scikit-learn>=0.18.1