From ad16aa2f3edf1b63527108dd80f1dd02843b690b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 20 Apr 2015 08:14:02 -0400 Subject: Stop re-invoking pip It turns out we need to just inject into install_requires so that pip's egg_info processing will do the right thing for dependencies. Change-Id: Ia6c4725b153b19c3d7e422b1fa62b70cded686e2 --- pbr/packaging.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pbr/packaging.py b/pbr/packaging.py index e266d4f..bd22609 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -179,27 +179,11 @@ class LocalInstall(install.install): Force a non-egg installed in the manner of single-version-externally-managed, which allows us to install manpages and config files. - - Because non-egg installs bypass the depend processing machinery, we - need to do our own. Because easy_install is evil, just use pip to - process our requirements files directly, which means we don't have to - do crazy extra processing. - - Bypass installation if --single-version-externally-managed is given, - so that behavior for packagers remains the same. """ command_name = 'install' def run(self): - option_dict = self.distribution.get_option_dict('pbr') - if (not self.single_version_externally_managed - and self.distribution.install_requires): - _pip_install( - self.distribution.dependency_links, - self.distribution.install_requires, self.root, - option_dict=option_dict) - return du_install.install.run(self) -- cgit v1.2.1