Skip to content

Commit

Permalink
Merge pull request #141 from rdegges/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jheld authored Aug 9, 2018
2 parents 917d4de + 9d7070e commit 9fb4e95
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 3 deletions.
21 changes: 20 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ python:
- '3.4'
- '3.5'
- '3.6'
# travis ci doesn't have good py 3.7 support, yet.
# - '3.7'
- 'pypy'
- 'pypy3'

Expand All @@ -14,6 +16,7 @@ env:
- DJANGO="django>=1.10,<1.11"
- DJANGO="django>=1.11,<2"
- DJANGO="django>=2.0,<2.1"
- DJANGO="django>=2.1,<2.2"

install:
- pip install ${DJANGO}
Expand All @@ -27,11 +30,27 @@ matrix:
exclude:
- python: "2.7"
env: DJANGO="django>=2.0,<2.1"
- python: "2.7"
env: DJANGO="django>=2.1,<2.2"
- python: "pypy"
env: DJANGO="django>=2.0,<2.1"
- python: "pypy"
env: DJANGO="django>=2.1,<2.2"
- python: "3.6"
env: DJANGO="django>=1.8,<1.9"
- python: "3.6"
env: DJANGO="django>=1.9,<1.10"
- python: "3.6"
env: DJANGO="django>=1.10,<1.11"
env: DJANGO="django>=1.10,<1.11"
- python: "3.4"
env: DJANGO="django>=2.1,<2.2"
- python: "3.7"
env: DJANGO="django>=1.8,<1.9"
- python: "3.7"
env: DJANGO="django>=1.9,<1.10"
- python: "3.7"
env: DJANGO="django>=1.10,<1.11"
- python: "3.7"
env: DJANGO="django>=1.11,<2"
- python: "3.7"
env: DJANGO="django>=2.0,<2.1"
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Django-twilio makes it easy to use Twilio in your Django projects.

Version 0.9.0 supports twilio 6.x and django 1.8-2.0.

Version 0.9.2 has minimal py3.7 and also allows django 2.1

For legacy twilio (5.x SDK), please see the 0.8 version.

Documentation
Expand Down
2 changes: 2 additions & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ User's Guide

Version 0.9.0 supports twilio 6.x and django 1.8-2.0.

Version 0.9.2 has minimal py3.7 and also allows django 2.1

For legacy twilio (5.x SDK), please see the 0.8 version.


Expand Down
12 changes: 10 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Basic package information:
name='django-twilio',
version='0.9.1',
version='0.9.2',
packages=find_packages(),

# Packaging options:
Expand All @@ -22,7 +22,8 @@
'twilio>=6.3.0,<7',
'Django>=1.8,<1.9;python_version=="3.3"',
'Django>=1.8,<2;python_version<"3.4"',
'Django>=1.8,<2.1;python_version>="3.4"',
'Django>=1.8,<2.2;python_version>="3.4, <3.7"',
'Django>=2.1,<2.2;python_version>="3.5"',
'django-phonenumber-field>=0.6',
],

Expand All @@ -38,6 +39,12 @@
).read(),
classifiers=[
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Intended Audience :: Developers',
'License :: Public Domain',
'Operating System :: OS Independent',
Expand All @@ -48,6 +55,7 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Internet :: WWW/HTTP',
Expand Down

0 comments on commit 9fb4e95

Please sign in to comment.