8000 Merge branch 'master' into master · SBillion/twilio-python@f3497d5 · GitHub
[go: up one dir, main page]
Skip to content

Commit f3497d5

Browse files
SBillionSBillion
authored
Merge branch 'master' into master
2 parents d4805d4 + fd20d3e commit f3497d5

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ python:
66
- '3.3'
77
- '3.4'
88
- '3.5'
9+
- '3.6'
910
install:
1011
- pip install .
1112
- pip install -r requirements.txt

‎setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
':python_version=="3.3"': ['pysocks'],
3636
':python_version=="3.4"': ['pysocks'],
3737
':python_version=="3.5"': ['pysocks'],
38+
':python_version=="3.6"': ['pysocks'],
3839
},
3940
packages = find_packages(exclude=['docs', 'tests*']),
4041
include_package_data=True,
@@ -51,6 +52,7 @@
5152
"Programming Language :: Python :: 3.3",
5253
"Programming Language :: Python :: 3.4",
5354
"Programming Language :: Python :: 3.5",
55+
"Programming Language :: Python :: 3.6",
5456
"Topic :: Software Development :: Libraries :: Python Modules",
5557
"Topic :: Communications :: Telephony",
5658
],

‎tox.ini

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

44
[testenv]
55
deps= -r{toxinidir}/tests/requirements.txt

0 commit comments

Comments
 (0)
0