From 267b44a06edda462c302091a5c09ecd2f94c187f Mon Sep 17 00:00:00 2001
From: Nicolas Hug <contact@nicolas-hug.com>
Date: Sat, 30 Sep 2017 12:14:14 +0200
Subject: [PATCH] update CHANGELOG.md and other file before release

---
 CHANGELOG.md                    | 21 +++++++++++++++++++++
 README.md                       |  5 -----
 examples/load_from_dataframe.py |  3 ---
 setup.py                        |  5 ++---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d84fad98..2a2a6dda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,28 @@
 Current
 =======
 
+VERSION 1.0.5 (in development)
+==============================
+
+VERSION 1.0.4
+=============
+
+Date: 20/09/17
+
+Enhancements
+------------
+
 * Added possibility to load a dataset from a pandas dataframe
+* Added Precision and Recall examples to the FAQ (Maher Malaeb)
+* Added a kNN algorithm with normalization by z-score (Hengji Liu)
+* kNN algorithms now use heapq instead of list.sort() (computation time
+  enhancement for large datasets).
+
+Fixes
+-----
+
+* Prediciont.__str__() when r_ui is None
+* GridSearch for dict parameters is now working as expected
 
 VERSION 1.0.3
 =============
diff --git a/README.md b/README.md
index f9d29b36..b51c1144 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,6 @@
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 
-### Temporary headline:
-
-The [Mangaki recommendation challenge](http://research.mangaki.fr/2017/07/18/mangaki-data-challenge-en/) is on! Have fun using Surprise!
-
-
 Surprise
 ========
 
diff --git a/examples/load_from_dataframe.py b/examples/load_from_dataframe.py
index f4608cd1..ed8bdf4b 100644
--- a/examples/load_from_dataframe.py
+++ b/examples/load_from_dataframe.py
@@ -1,8 +1,5 @@
 """
 This module descibes how to load a dataset from a pandas dataframe.
-WARNING: this feature is only available in the latest version, so if you have
-installed surprise with pip this is not available. Please clone the repo and
-install it (see guidelines on the README).
 """
 
 from __future__ import (absolute_import, division, print_function,
diff --git a/setup.py b/setup.py
index f69d7f2d..219530ca 100644
--- a/setup.py
+++ b/setup.py
@@ -5,8 +5,7 @@
 """
 Release instruction:
 mktmpenv (Python version should not matter)
-Remove 'WARNING...' (load_from_dataframe.py)
-pip install numpy cython pypandoc
+pip install numpy cython pypandoc twine
 python setup.py sdist
 twine upload dist/blabla.tar.gz [-r testpypi]
 """
@@ -24,7 +23,7 @@
 else:
     USE_CYTHON = True
 
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
 here = path.abspath(path.dirname(__file__))