openstack/oslo-incubator
Code Issues Proposed changes

Stop using no longer valid -E option for pip

Browse Source 
Fixes bug 1100403

Version 1.1 of pip dropped the -E option. It's not necessary anyway since
running pip in a correctly setup virtualenv will automatically do the right
thing.

Change-Id: Ifec9f27b8dc169d594125a0808126abe77ed42e7
This commit is contained in:
Johannes Erdfelt 2013-01-16 18:05:50 +00:00
parent 848b1cf1fa
commit 93aacfa8ef
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack/common/setup.py
View File

@ -108,10 +108,9 @@ def parse_dependency_links(requirements_files=['requirements.txt',
def write_requirements():
venv = os.environ.get('VIRTUAL_ENV', None)
if venv is not None:
if 'VIRTUAL_ENV' in os.environ:
with open("requirements.txt", "w") as req_file:
output = subprocess.Popen(["pip", "-E", venv, "freeze", "-l"],
output = subprocess.Popen(["pip", "freeze", "-l"],
stdout=subprocess.PIPE)
requirements = output.communicate()[0].strip()
req_file.write(requirements)