From 796af1779225dff5cb45c8c6750428fc8215ac46 Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Tue, 27 Jun 2017 10:04:41 -0700 Subject: [PATCH 1/6] changes --- setup.py | 47 +++++++++++++++++++++++++++++++++------------- twilio/__init__.py | 2 +- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index d015561de6..e92831896e 100755 --- a/setup.py +++ b/setup.py @@ -13,12 +13,12 @@ # # You need to have the setuptools module installed. Try reading the setuptools # documentation: http://pypi.python.org/pypi/setuptools -REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2"] +# REQUIRES = -if sys.version_info < (3, 0): - REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"]) -if sys.version_info >= (3, 0): - REQUIRES.append('pysocks') +# if sys.version_info < (3, 0): +# REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"]) +# if sys.version_info >= (3, 0): +# REQUIRES.append('pysocks') setup( name = "twilio", @@ -28,14 +28,35 @@ author_email = "help@twilio.com", url = "https://github.com/twilio/twilio-python/", keywords = ["twilio","twiml"], - install_requires = REQUIRES, - # bdist conditional requirements support - extras_require={ - ':python_version=="3.3"': ['pysocks'], - ':python_version=="3.4"': ['pysocks'], - ':python_version=="3.5"': ['pysocks'], - ':python_version=="3.6"': ['pysocks'], - }, + install_requires = [ + # "requests >= 2.0.0", + "six", + "pytz", + "PyJWT >= 1.4.2, <1.5.1", + # Python 2 dependencies + "requests[security] >= 2.0.0;python_version<'3'", + # "cryptography >= 1.3.4;python_version<'3'", + # "idna >= 2.0.0;python_version<'3'", + # "pyOpenSSL >= 0.14;python_version<'3'", + # Python 3 dependencies + "requests >= 2.0.0;python_version>='3'", + "pysocks;python_version>='3'" + ], + dependency_links=[ + 'https://pypi.python.org/pypi', + 'https://pypi.python.org/pypi/six', + 'https://pypi.python.org/pypi/pytz', + 'https://pypi.python.org/pypi/pyjwt', + 'https://pypi.python.org/pypi/requests', + 'https://pypi.python.org/pypi/pysocks' + ], + # # bdist conditional requirements support + # extras_require={ + # ':python_version=="3.3"': ['pysocks'], + # ':python_version=="3.4"': ['pysocks'], + # ':python_version=="3.5"': ['pysocks'], + # ':python_version=="3.6"': ['pysocks'], + # }, packages = find_packages(exclude=['tests', 'tests.*']), include_package_data=True, classifiers = [ diff --git a/twilio/__init__.py b/twilio/__init__.py index 32dd60b126..ff6a269a5c 100644 --- a/twilio/__init__.py +++ b/twilio/__init__.py @@ -1,3 +1,3 @@ -__version_info__ = ('6', '4', '1') +__version_info__ = ('6', '4', '5') __version__ = '.'.join(__version_info__) From cf93655e01303bde0d2ac02950093ba705e02904 Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Tue, 11 Jul 2017 10:15:31 -0700 Subject: [PATCH 2/6] fix --- twilio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twilio/__init__.py b/twilio/__init__.py index ff6a269a5c..dc551bcd3d 100644 --- a/twilio/__init__.py +++ b/twilio/__init__.py @@ -1,3 +1,3 @@ -__version_info__ = ('6', '4', '5') +__version_info__ = ('6', '4', '2') __version__ = '.'.join(__version_info__) From 8711440590096e0d5b7f4fc0b9b79056eac6de3c Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Tue, 11 Jul 2017 10:16:11 -0700 Subject: [PATCH 3/6] fixes --- setup.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index d005b14064..eec352f4b4 100755 --- a/setup.py +++ b/setup.py @@ -42,14 +42,6 @@ "requests >= 2.0.0;python_version>='3'", "pysocks;python_version>='3'" ], - dependency_links=[ - 'https://pypi.python.org/pypi', - 'https://pypi.python.org/pypi/six', - 'https://pypi.python.org/pypi/pytz', - 'https://pypi.python.org/pypi/pyjwt', - 'https://pypi.python.org/pypi/requests', - 'https://pypi.python.org/pypi/pysocks' - ], # # bdist conditional requirements support # extras_require={ # ':python_version=="3.3"': ['pysocks'], From 58ae11cd985defb3145a95d52849bc7d16908e07 Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Tue, 11 Jul 2017 10:18:58 -0700 Subject: [PATCH 4/6] fixes --- setup.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/setup.py b/setup.py index eec352f4b4..b3b8a4f1d3 100755 --- a/setup.py +++ b/setup.py @@ -13,12 +13,6 @@ # # You need to have the setuptools module installed. Try reading the setuptools # documentation: http://pypi.python.org/pypi/setuptools -# REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2,<1.5.1"] - -# if sys.version_info < (3, 0): -# REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"]) -# if sys.version_info >= (3, 0): -# REQUIRES.append('pysocks') setup( name = "twilio", @@ -29,26 +23,15 @@ url = "https://github.com/twilio/twilio-python/", keywords = ["twilio","twiml"], install_requires = [ - # "requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2, <1.5.1", # Python 2 dependencies "requests[security] >= 2.0.0;python_version<'3'", - # "cryptography >= 1.3.4;python_version<'3'", - # "idna >= 2.0.0;python_version<'3'", - # "pyOpenSSL >= 0.14;python_version<'3'", # Python 3 dependencies "requests >= 2.0.0;python_version>='3'", "pysocks;python_version>='3'" ], - # # bdist conditional requirements support - # extras_require={ - # ':python_version=="3.3"': ['pysocks'], - # ':python_version=="3.4"': ['pysocks'], - # ':python_version=="3.5"': ['pysocks'], - # ':python_version=="3.6"': ['pysocks'], - # }, packages = find_packages(exclude=['tests', 'tests.*']), include_package_data=True, classifiers = [ From a6c30559d14daba381b720d34b8c288fa55bec3b Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Tue, 11 Jul 2017 16:41:27 -0700 Subject: [PATCH 5/6] fix --- setup.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index b3b8a4f1d3..6f13002609 100755 --- a/setup.py +++ b/setup.py @@ -26,12 +26,16 @@ "six", "pytz", "PyJWT >= 1.4.2, <1.5.1", - # Python 2 dependencies - "requests[security] >= 2.0.0;python_version<'3'", - # Python 3 dependencies - "requests >= 2.0.0;python_version>='3'", - "pysocks;python_version>='3'" ], + extras_require={ + ':python_version=="2.7"': [ + "requests[security] >= 2.0.0", + ], + ':python_version>="3.3"': [ + "requests >= 2.0.0", + "pysocks", + ], + }, packages = find_packages(exclude=['tests', 'tests.*']), include_package_data=True, classifiers = [ From 5012cb109cd60d45a795b7a81be283cdb7130a85 Mon Sep 17 00:00:00 2001 From: Ilan Biala Date: Wed, 12 Jul 2017 10:45:32 -0700 Subject: [PATCH 6/6] fix --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6f13002609..f3c959fce7 100755 --- a/setup.py +++ b/setup.py @@ -28,10 +28,10 @@ "PyJWT >= 1.4.2, <1.5.1", ], extras_require={ - ':python_version=="2.7"': [ + ':python_version<"3.0"': [ "requests[security] >= 2.0.0", ], - ':python_version>="3.3"': [ + ':python_version>="3.0"': [ "requests >= 2.0.0", "pysocks", ],