8000 Drop Python 2.6 support · burhan/twilio-python@3c5ade2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3c5ade2

Browse files
committed
Drop Python 2.6 support
1 parent a99e483 commit 3c5ade2

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- "2.6"
43
- "2.7"
54
- "3.3"
65
- "3.4"

setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# documentation: http://pypi.python.org/pypi/setuptools
1616
REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2"]
1717

18-
if sys.version_info < (2, 6):
19-
REQUIRES.append('simplejson')
2018
if sys.version_info < (3, 0):
2119
REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"])
2220
if sys.version_info >= (3, 0):
@@ -46,7 +44,6 @@
4644
"License :: OSI Approved :: MIT License",
4745
"Operating System :: OS Independent",
4846
"Programming Language :: Python",
49-
"Programming Language :: Python :: 2.6",
5047
"Programming Language :: Python :: 2.7",
5148
"Programming Language :: Python :: 3.3",
5249
"Programming Language :: Python :: 3.4",

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[tox]
2-
envlist = py26, py27, py33, py34, py35, py36, pypy
2+
envlist = py27, py33, py34, py35, py36, pypy
33

44
[testenv]
55
deps= -r{toxinidir}/tests/requirements.txt
66
commands=
77
nosetests \
88
[]
9-

0 commit comments

Comments
 (0)
0