From f931ee084e061683fd59d55a7e5232daf388b6c2 Mon Sep 17 00:00:00 2001 From: Phoenix Zerin Date: Mon, 24 Apr 2017 19:26:36 -0500 Subject: [PATCH] Wheels no longer universal, fixed deps. --- setup.cfg | 2 -- setup.py | 31 ++++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 3c6e79c..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/setup.py b/setup.py index 8befeff..e0b4dd2 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, division, print_function from codecs import StreamReader, open +from sys import version_info from setuptools import find_packages, setup @@ -13,6 +14,24 @@ with open('README.rst', 'r', 'utf-8') as f: # type: StreamReader long_description = f.read() + +## +# Certain dependencies are optional depending on Python version. +dependencies = [ + 'filters', + 'six', + + # ``security`` extra wasn't introduced until 2.4.1 + # http://docs.python-requests.org/en/latest/community/updates/#id35 + 'requests[security] >= 2.4.1', +] + +if version_info[0] < 3: + dependencies.extend([ + 'typing', + ]) + + ## # Off we go! setup( @@ -26,17 +45,7 @@ long_description = long_description, - install_requires = [ - 'filters', - - # `security` package wasn't introduced until 2.4.1 - # References: - # - http://docs.python-requests.org/en/latest/community/updates/#id35 - 'requests[security] >= 2.4.1', - - 'six', - 'typing', - ], + install_requires = dependencies, extras_require = { 'ccurl': ['pyota-ccurl'],