Skip to content

Commit

Permalink
Support 1.11-2.1; py3.7 (#149)
Browse files Browse the repository at this point in the history
Support 1.11-2.1; py3.7

pypy travis weird versions

adjust setup.py to have dynamic install requires

travis less env
  • Loading branch information
jheld committed Mar 28, 2019
1 parent d50ead8 commit 5defec8
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 32 deletions.
45 changes: 22 additions & 23 deletions .travis.yml
@@ -1,20 +1,21 @@
language: python

dist: zenial

python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
# travis ci doesn't have good py 3.7 support, yet.
# - '3.7'
- 'pypy'
- 'pypy3'
- '3.7'
# - 'pypy'
- 'pypy2.7-6.0'
# - 'pypy3'
- 'pypy3.5-6.0'

env:
- DJANGO="django>=1.8,<1.9"
- DJANGO="django>=1.9,<1.10"
- DJANGO="django>=1.10,<1.11"
- DJANGO="django>=1.11,<2"
- DJANGO="django>=1.11.17,<2.0"
- DJANGO="django>=2.0,<2.1"
- DJANGO="django>=2.1,<2.2"

Expand All @@ -28,29 +29,27 @@ script:

matrix:
exclude:
- python: "2.7"
env: DJANGO="django>=1.11.17,<2.0"
- python: "2.7"
env: DJANGO="django>=2.0,<2.1"
- python: "2.7"
env: DJANGO="django>=2.1,<2.2"
- python: "pypy"
- python: "pypy2.7-6.0"
env: DJANGO="django>=1.11.17,<2.0"
- python: "pypy2.7-6.0"
env: DJANGO="django>=2.0,<2.1"
- python: "pypy"
- python: "pypy2.7-6.0"
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"
- python: "3.4"
env: DJANGO="django>=1.11.17,<2.0"
- 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.5"
env: DJANGO="django>=1.11.17,<2.0"
- python: "3.6"
env: DJANGO="django>=1.11.17,<2.0"
- python: "pypy3.5-6.0"
env: DJANGO="django>=1.11.17,<2.0"
- python: "3.7"
env: DJANGO="django>=1.11,<2"
- python: "3.7"
env: DJANGO="django>=2.0,<2.1"
29 changes: 20 additions & 9 deletions setup.py
Expand Up @@ -3,13 +3,31 @@
from os.path import abspath, dirname, join, normpath

from setuptools import find_packages, setup
import sys


INSTALL_PYTHON_REQUIRES = []
if sys.version_info[0] == 2:
# less than py3.4 can run 1.11-<2
django_python_version_install = 'Django>=1.11,<2',
INSTALL_PYTHON_REQUIRES.append(django_python_version_install)
elif sys.version_info[0] == 3:
if sys.version_info[1] == 4:
# py3.4 can run 1.11-<2.1
django_python_version_install = 'Django>=1.11,<2.1',
INSTALL_PYTHON_REQUIRES.append(django_python_version_install)
elif 5 <= sys.version_info[1] < 7:
# py3.5+ can run 1.11.17 < 2.2
django_python_version_install = 'Django>=1.11,<2.2',
INSTALL_PYTHON_REQUIRES.append(django_python_version_install)
elif sys.version_info[1] >= 7:
django_python_version_install = 'Django>=1.11.17,<2.2'
INSTALL_PYTHON_REQUIRES.append(django_python_version_install)
setup(

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

# Packaging options:
Expand All @@ -20,12 +38,8 @@
install_requires=[
'setuptools>=36.2',
'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.2;python_version>="3.4, <3.7"',
'Django>=2.1,<2.2;python_version>="3.5"',
'django-phonenumber-field>=0.6',
],
] + INSTALL_PYTHON_REQUIRES,

# Metadata for PyPI:
author='Randall Degges',
Expand All @@ -39,9 +53,6 @@
).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',
Expand Down

0 comments on commit 5defec8

Please sign in to comment.