From 23ee483e1c27fca7e3867a7cf2864ab045d67708 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Thu, 24 Jan 2019 01:52:09 -0500 Subject: [PATCH] Add pep517 to environment path Signed-off-by: Dan Ryan --- pipenv/environment.py | 8 ++++++++ pipenv/vendor/requirementslib/models/requirements.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pipenv/environment.py b/pipenv/environment.py index 9ff8b54b..9397fbfd 100644 --- a/pipenv/environment.py +++ b/pipenv/environment.py @@ -475,6 +475,7 @@ class Environment(object): vendor_dir = parent_path.joinpath("vendor").as_posix() patched_dir = parent_path.joinpath("patched").as_posix() parent_path = parent_path.as_posix() + self.add_dist("pip") prefix = self.prefix.as_posix() with vistir.contextmanagers.temp_environ(), vistir.contextmanagers.temp_path(): os.environ["PATH"] = os.pathsep.join([ @@ -496,6 +497,13 @@ class Environment(object): sys.path = self.sys_path sys.prefix = self.sys_prefix site.addsitedir(self.base_paths["purelib"]) + pip = self.safe_import("pip") + pip_vendor = self.safe_import("pip._vendor") + pep517_dir = os.path.join(os.path.dirname(pip_vendor.__file__), "pep517") + site.addsitedir(pep517_dir) + os.environ["PYTHONPATH"] = os.pathsep.join([ + os.environ["PYTHONPATH"], pep517_dir + ]) if include_extras: site.addsitedir(parent_path) sys.path.extend([parent_path, patched_dir, vendor_dir]) diff --git a/pipenv/vendor/requirementslib/models/requirements.py b/pipenv/vendor/requirementslib/models/requirements.py index 82925368..4403950a 100644 --- a/pipenv/vendor/requirementslib/models/requirements.py +++ b/pipenv/vendor/requirementslib/models/requirements.py @@ -1586,9 +1586,9 @@ class VCSRequirement(FileRequirement): relpath = None parsed_line = Line(line) if editable: - line.editable = editable + parsed_line.editable = editable if extras: - line.extras = extras + parsed_line.extras = extras if line.startswith("-e "): editable = True line = line.split(" ", 1)[1]