Merge remote-tracking branch 'origin/master' into fix/3.7-tests

Author: pterk

.travis.yml

@@ -5,8 +5,8 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7
 env:
+  - DJANGO="django>=2.1.0,<2.2.0"
   - DJANGO="django>=2.0.0,<2.1.0"
   - DJANGO="django>=1.11.0,<1.12.0"
   - DJANGO="django>=1.10.2,<1.11.0"
@@ -20,6 +20,10 @@ matrix:
   exclude:
     - python: 2.7
       env: DJANGO="django>=2.0.0,<2.1.0"
+    - python: 2.7
+      env: DJANGO="django>=2.1.0,<2.2.0"
+    - python: 3.4
+      env: DJANGO="django>=2.1.0,<2.2.0"
     - python: 3.7
       env: DJANGO="django>=1.11.0,<1.12.0"
     - python: 3.7

README.md

@@ -1,7 +1,7 @@
 ## Stream Django
 [![Build Status](https://travis-ci.org/GetStream/stream-django.svg?branch=master)](https://travis-ci.org/GetStream/stream-django) [![Coverage Status](https://coveralls.io/repos/github/GetStream/stream-django/badge.svg?branch=master)](https://coveralls.io/github/GetStream/stream-django?branch=master) [![PyPI version](https://badge.fury.io/py/stream-django.svg)](http://badge.fury.io/py/stream-django)
 
-[stream-django](https://github.com/GetStream/stream-django) is a Django client for [Stream](https://getstream.io/), it supports Django from 1.5 up to and including 2.0 using Python 2.7 and 3.4, 3.5 and 3.6.
+[stream-django](https://github.com/GetStream/stream-django) is a Django client for [Stream](https://getstream.io/), it supports Django from 1.5 up to and including 2.1 using Python 2.7 and 3.4, 3.5 and 3.6.
 
 You can sign up for a Stream account at https://getstream.io/get_started.
 
@@ -187,7 +187,7 @@ class Follow(models.Model, Activity):
 
 
 #### Follow a feed
-The create the newsfeeds you need to notify the system about follow relationships. The manager comes with APIs to let a user's news feeds follow another user's feed. This code lets the current user's timeline and timeline_aggregated feeds follow the target_user's personal feed.
+To create the newsfeeds you need to notify the system about follow relationships. The manager comes with APIs to let a user's news feeds follow another user's feed. This code lets the current user's timeline and timeline_aggregated feeds follow the target_user's personal feed.
 
 ```python
 feed_manager.follow_user(request.user.id, target_user)

setup.py

@@ -7,9 +7,9 @@
     README = readme.read()
 
 if sys.version_info < (3, 0, 0):
-    django = 'django>=1.5,<2.0'
+    django = 'django>=1.8.10,<2.0'
 else:
-    django = 'django>=1.5,<2.1.0'
+    django = 'django>=1.8.10,<2.2'
 
 requirements = [
     django,