diff options
author | Dan Prince <dprince@redhat.com> | 2012-06-20 12:39:51 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2012-06-20 12:43:32 -0400 |
commit | c986a17be967fee897897cb8abc86b27d2426f75 (patch) | |
tree | af21800c2a20a24e4edcb79472a817db440bb901 /openstack | |
parent | b76f83946ff9adbfbb482c9ec2fe623e679dde07 (diff) | |
download | oslo-c986a17be967fee897897cb8abc86b27d2426f75.tar.gz oslo-c986a17be967fee897897cb8abc86b27d2426f75.tar.xz oslo-c986a17be967fee897897cb8abc86b27d2426f75.zip |
Skip argparse when injecting requirements.
Also adds some unit tests parse_requirements.
Change-Id: I3d8625d4627c7933d73059a63f96e19f8d9647ab
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/common/setup.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index 429ba35..6b34417 100644 --- a/openstack/common/setup.py +++ b/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) |