From 4572ffd483bf69130f5680429d559e2810b7f0e9 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 12 Sep 2016 19:37:16 +0100 Subject: install ordereddict only on 2.6 with wheel --- setup.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 05c12b8f..15e4571b 100755 --- a/setup.py +++ b/setup.py @@ -68,8 +68,23 @@ def _stamp_version(filename): print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr) install_requires = ['gitdb >= 0.6.4'] -if sys.version_info[:2] < (2, 7): - install_requires.append('ordereddict') +extras_require = { + ':python_version == "2.6"': ['ordereddict'], +} + +try: + if 'bdist_wheel' not in sys.argv: + for key, value in extras_require.items(): + if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]): + install_requires.extend(value) +except Exception: + logging.getLogger(__name__).exception( + 'Something went wrong calculating platform specific dependencies, so ' + "you're getting them all!" + ) + for key, value in extras_require.items(): + if key.startswith(':'): + install_requires.extend(value) # end setup( -- cgit v1.2.1 From 2253d39f3a5ffc4010c43771978e37084e642acc Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 1 Oct 2016 14:26:57 +0200 Subject: fix(setup): add missing imports --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 15e4571b..35b11153 100755 --- a/setup.py +++ b/setup.py @@ -9,6 +9,8 @@ except ImportError: from distutils.command.build_py import build_py as _build_py from setuptools.command.sdist import sdist as _sdist +import pkg_resources +import logging import os import sys from os import path -- cgit v1.2.1