Skip to content

Commit

Permalink
Merge pull request #89 from GetStream/v1.6
Browse files Browse the repository at this point in the history
V1.6
  • Loading branch information
pterk committed Jun 13, 2019
2 parents 15c6183 + a749c49 commit 6501c19
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions .travis.yml
Expand Up @@ -6,6 +6,7 @@ python:
- 3.5
- 3.6
env:
- DJANGO="django>=2.2.0,<3.0"
- DJANGO="django>=2.1.0,<2.2.0"
- DJANGO="django>=2.0.0,<2.1.0"
- DJANGO="django>=1.11.0,<1.12.0"
Expand All @@ -22,8 +23,16 @@ matrix:
env: DJANGO="django>=2.0.0,<2.1.0"
- python: 2.7
env: DJANGO="django>=2.1.0,<2.2.0"
- python: 2.7
env: DJANGO="django>=2.2.0,<3.0"
- python: 3.4
env: DJANGO="django>=2.1.0,<2.2.0"
- python: 3.4
env: DJANGO="django>=2.2.0,<3.0"
- python: 3.5
env: DJANGO="django>=2.2.0,<3.0"
- python: 3.6
env: DJANGO="django>=2.2.0,<3.0"
- python: 3.7
env: DJANGO="django>=1.11.0,<1.12.0"
- python: 3.7
Expand Down
2 changes: 1 addition & 1 deletion 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.1 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.2 using Python 2.7 and 3.4, 3.5, 3.6 and 3.7.

You can sign up for a Stream account at https://getstream.io/get_started.

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -9,11 +9,11 @@
if sys.version_info < (3, 0, 0):
django = 'django>=1.8.10,<2.0'
else:
django = 'django>=1.8.10,<2.2'
django = 'django>=1.8.10,<3.0'

requirements = [
django,
'stream-python>=2.8.1',
'stream-python>=3.0.1',
'pytz'
]

Expand All @@ -23,7 +23,7 @@

setup(
name='stream-django',
version='1.5.0',
version='1.6.0',
packages=['stream_django'],
include_package_data=True,
install_requires=requirements,
Expand Down

0 comments on commit 6501c19

Please sign in to comment.