8000 Fix package distribution by ilanbiala · Pull Request #368 · twilio/twilio-python · GitHub
[go: up one dir, main page]
Skip to content

Fix package distribution #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

8000

Already on GitHub? Sign in to your account

Merged
7 commits merged into from
Jul 12, 2017
Merged

Fix package distribution #368

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
796af17
changes
ilanbiala Jun 27, 2017
cf45e9a
Merge branch 'master' into test-install
ilanbiala Jul 11, 2017
cf93655
fix
ilanbiala Jul 11, 2017
8711440
fixes
ilanbiala Jul 11, 2017
58ae11c
fixes
ilanbiala Jul 11, 2017
a6c3055
fix
ilanbiala Jul 11, 2017
5012cb1
fix
ilanbiala Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
8000
Diff view
24 changes: 12 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -28,13 +22,19 @@
author_email = "help@twilio.com",
url = "https://github.com/twilio/twilio-python/",
keywords = ["twilio","twiml"],
install_requires = REQUIRES,
# bdist conditional requirements support
install_requires = [
"six",
"pytz",
"PyJWT >= 1.4.2, <1.5.1",
],
extras_require={
':python_version=="3.3"': ['pysocks'],
':python_version=="3.4"': ['pysocks'],
':python_version=="3.5"': ['pysocks'],
':python_version=="3.6"': ['pysocks'],
':python_version<"3.0"': [
"requests[security] >= 2.0.0",
],
':python_version>="3.0"': [
"requests >= 2.0.0",
"pysocks",
],
},
packages = find_packages(exclude=['tests', 'tests.*']),
include_package_data=True,
Expand Down
0