diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-06-21 01:24:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-06-21 01:24:09 +0000 |
commit | f6267d5c0d72da6e1270894172b0497527b280c0 (patch) | |
tree | 22dad2c0050210b07046a9946e9a86839e622d4e | |
parent | 8288121a8c30f2d202db57a00ad4441827664c37 (diff) | |
parent | cfb437e72052ab65bc8d3d0748827c65c6d894bb (diff) | |
download | python-keystoneclient-f6267d5c0d72da6e1270894172b0497527b280c0.tar.gz |
Merge "Skip argparse when injecting requirements."
-rw-r--r-- | keystoneclient/openstack/common/setup.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/keystoneclient/openstack/common/setup.py b/keystoneclient/openstack/common/setup.py index 429ba35..6b34417 100644 --- a/keystoneclient/openstack/common/setup.py +++ b/keystoneclient/openstack/common/setup.py @@ -22,6 +22,7 @@ Utilities with minimum-depends for use in setup.py import os import re import subprocess +import sys from setuptools.command import sdist @@ -76,6 +77,10 @@ def parse_requirements(requirements_files=['requirements.txt', # -f lines are for index locations, and don't get used here elif re.match(r'\s*-f\s+', line): pass + # argparse is part of the standard library starting with 2.7 + # adding it to the requirements list screws distro installs + elif line == 'argparse' and sys.version_info >= (2, 7): + pass else: requirements.append(line) |