8000 Fix package distribution (#368) · thecodeflash/twilio-python@94b5ff9 · GitHub
[go: up one dir, main page]

Skip to content

Commit 94b5ff9

Browse files
ilanbialatmconnors
authored andcommitted
Fix package distribution (twilio#368)
* changes * fix * fixes * fixes * fix * fix
1 parent 0eec3b6 commit 94b5ff9

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

setup.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
#
1414
# You need to have the setuptools module installed. Try reading the setuptools
1515
# documentation: http://pypi.python.org/pypi/setuptools
16-
REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2,<1.5.1"]
17-
18-
if sys.version_info < (3, 0):
19-
REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"])
20-
if sys.version_info >= (3, 0):
21-
REQUIRES.append('pysocks')
2216

2317
setup(
2418
name = "twilio",
@@ -28,13 +22,19 @@
2822
author_email = "help@twilio.com",
2923
url = "https://github.com/twilio/twilio-python/",
3024
keywords = ["twilio","twiml"],
31-
install_requires = REQUIRES,
32-
# bdist conditional requirements support
25+
install_requires = [
26+
"six",
27+
"pytz",
28+
"PyJWT >= 1.4.2, <1.5.1",
29+
],
3330
extras_require={
34-
':python_version=="3.3"': ['pysocks'],
35-
':python_version=="3.4"': ['pysocks'],
36-
':python_version=="3.5"': ['pysocks'],
37-
':python_version=="3.6"': ['pysocks'],
31+
':python_version<"3.0"': [
32+
"requests[security] >= 2.0.0",
33+
],
34+
':python_version>="3.0"': [
35+
"requests >= 2.0.0",
36+
"pysocks",
37+
],
3838
},
3939
packages = find_packages(exclude=['tests', 'tests.*']),
4040
include_package_data=True,

0 commit comments

Comments
 (0)
0