Merge branch 'master' of github.com:EventRegistry/event-registry-python

# Conflicts:
#	CHANGELOG.md
#	eventregistry/QueryArticles.py
#	eventregistry/_version.py
#	eventregistry/tests/TestAnalytics.py

Author: gregorleban

CHANGELOG.md

@@ -9,13 +9,21 @@
 **Updated**
 
 - Analytics: We updated `trainTopicOnTweets()`, `trainTopicClearTopic()` and `trainTopicGetTrainedTopic()` methods in the `Analytics` class.
-- `QueryArticles.initWithComplexQuery()` was updated - the parameter `dataType` was removed (since the `dataType` value should be provided in the `$filter` section of the query)
-- `TopicPage` now supports setting also the source rank percentile
 - `Analytics.annotate()` method now supports passing custom parameters that should be used when annotating the text.
-- `Analytics.extractArticleInfo()` now also supports passing headers and cookies to be used when extracting article info from url.
 - Changed some defaults in the returned data. When searching articles, we now by default return article image and sentiment.
 
 
+## [v8.5.1]() (2018-12-12)
+
+**Updated**
+
+- Analytics. updated `trainTopicOnTweets()`, `trainTopicClearTopic()` and `trainTopicGetTrainedTopic()` methods in the `Analytics` class.
+- `QueryArticles.initWithComplexQuery()` was updated - the parameter `dataType` was removed (since the `dataType` value should be provided in the `$filter` section of the query)
+- `TopicPage` now supports setting also the source rank percentile
+- `Analytics.extractArticleInfo` now also supports setting the headers and cookies to be used when making the requests
+
+
+
 ## [v8.5]() (2018-08-29)
 
 **Added**

eventregistry/QueryArticles.py

@@ -287,7 +287,7 @@ def initWithComplexQuery(query):
         @param query: complex query as ComplexArticleQuery instance, string or a python dict
         """
         q = QueryArticlesIter()
-
+        
         # provided an instance of ComplexArticleQuery
         if isinstance(query, ComplexArticleQuery):
             q._setVal("query", json.dumps(query.getQuery()))

eventregistry/tests/TestAnalytics.py

@@ -81,7 +81,7 @@ def testTrainTopic(self):
         analytics.trainTopicAddDocument(uri, "Emmanuel Macron’s climate commitment to “make this planet great again” has come under attack after his environment minister dramatically quit, saying the French president was not doing enough on climate and other environmental goals.")
         analytics.trainTopicAddDocument(uri, "Theresa May claimed that a no-deal Brexit “wouldn’t be the end of the world” as she sought to downplay a controversial warning made by Philip Hammond last week that it would cost £80bn in extra borrowing and inhibit long-term economic growth.")
         # finish training of the topic
-        ret = analytics.trainTopicGetTrainedTopic(uri, ignoreConceptTypes="wiki")
+        ret = analytics.trainTopicFinishTraining(uri, ignoreConceptTypes="wiki")
         assert ret and "topic" in ret
         topic = ret["topic"]
         assert "concepts" in topic and len(topic["concepts"]) > 0