From e13ea2a7c65f233df0bc526ae073c01747258de8 Mon Sep 17 00:00:00 2001 From: Arcadiy Ivanov Date: Fri, 24 Sep 2021 05:56:28 -0400 Subject: During seeding properly uninstall present versions of the wheels (#2186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * During seeding remove dist-info for present versions of the wheels An existing dist-info may contain entrypoints that may interfere with normal functioning of the redeployed seeded wheel if there is a version mismatch fixes #2185 * Remove package directories from dist-info top_level packages Remove other recorded files from RECORD Remove dist-info itself * Do not resolve paths prior to removal for symlink mode In the test ensure the directories are compared as sets and not lists Add setuptools downgrade to ensure proper cleanup of the existing version * PR Feedback Signed-off-by: Bernát Gábor Co-authored-by: Bernát Gábor --- .../seed/embed/via_app_data/pip_install/base.py | 37 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/virtualenv/seed/embed/via_app_data/pip_install/base.py b/src/virtualenv/seed/embed/via_app_data/pip_install/base.py index 017b7ef..35e0cca 100644 --- a/src/virtualenv/seed/embed/via_app_data/pip_install/base.py +++ b/src/virtualenv/seed/embed/via_app_data/pip_install/base.py @@ -5,6 +5,7 @@ import os import re import zipfile from abc import ABCMeta, abstractmethod +from itertools import chain from tempfile import mkdtemp from distlib.scripts import ScriptMaker, enquote_executable @@ -31,14 +32,10 @@ class PipInstall(object): def install(self, version_info): self._extracted = True + self._uninstall_previous_version() # sync image for filename in self._image_dir.iterdir(): into = self._creator.purelib / filename.name - if into.exists(): - if into.is_dir() and not into.is_symlink(): - safe_delete(into) - else: - into.unlink() self._sync(filename, into) # generate console executables consoles = set() @@ -150,6 +147,36 @@ class PipInstall(object): result.extend(Path(i) for i in new_files) return result + def _uninstall_previous_version(self): + dist_name = self._dist_info.stem.split("-")[0] + in_folders = chain.from_iterable([i.iterdir() for i in {self._creator.purelib, self._creator.platlib}]) + paths = (p for p in in_folders if p.stem.split("-")[0] == dist_name and p.suffix == ".dist-info" and p.is_dir()) + existing_dist = next(paths, None) + if existing_dist is not None: + self._uninstall_dist(existing_dist) + + @staticmethod + def _uninstall_dist(dist): + dist_base = dist.parent + logging.debug("uninstall existing distribution %s from %s", dist.stem, dist_base) + + top_txt = dist / "top_level.txt" # add top level packages at folder level + paths = {dist.parent / i.strip() for i in top_txt.read_text().splitlines()} if top_txt.exists() else set() + paths.add(dist) # add the dist-info folder itself + + base_dirs, record = paths.copy(), dist / "RECORD" # collect entries in record that we did not register yet + for name in (i.split(",")[0] for i in record.read_text().splitlines()) if record.exists() else (): + path = dist_base / name + if not any(p in base_dirs for p in path.parents): # only add if not already added as a base dir + paths.add(path) + + for path in sorted(paths): # actually remove stuff in a stable order + if path.exists(): + if path.is_dir() and not path.is_symlink(): + safe_delete(path) + else: + path.unlink() + def clear(self): if self._image_dir.exists(): safe_delete(self._image_dir) -- cgit v1.2.1