openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Skip argparse when injecting requirements."

Browse Source
This commit is contained in:
Jenkins
2012-06-21 01:24:09 +00:00
committed by Gerrit Code Review
parent 8288121a8c cfb437e720
commit f6267d5c0d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/openstack/common/setup.py
View File

@@ -22,6 +22,7 @@ Utilities with minimum-depends for use in setup.py
import os import os
import re import re
import subprocess import subprocess
import sys
from setuptools.command import sdist 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 # -f lines are for index locations, and don't get used here
elif re.match(r'\s*-f\s+', line): elif re.match(r'\s*-f\s+', line):
pass 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: else:
requirements.append(line) requirements.append(line)