From 94b55ff2fb89b49a8b7b50d24e55e2b3230c4e29 Mon Sep 17 00:00:00 2001 From: Eli Kogan-Wang Date: Tue, 20 Aug 2024 11:29:55 +0200 Subject: [PATCH] Update appenv: Freeze all relevant packages --- appenv.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/appenv.py b/appenv.py index 574928ba..4497c3a6 100755 --- a/appenv.py +++ b/appenv.py @@ -564,12 +564,6 @@ def reset(self, args=None, remaining=None): def update_lockfile(self, args=None, remaining=None): ensure_minimal_python() - preferences = parse_preferences() - python312_mixed_setuptools_workaround = False - if preferences is not None: - if any(f"3.{x}" in preferences for x in range(4, 12)): - if any(f"3.{x}" in preferences for x in range(12, 20)): - python312_mixed_setuptools_workaround = True os.chdir(self.base) print("Updating lockfile") tmpdir = os.path.join(self.appenv_dir, "updatelock") @@ -580,12 +574,9 @@ def update_lockfile(self, args=None, remaining=None): pip(tmpdir, ["install", "-r", "requirements.txt"]) extra_specs = [] - pip_freeze_args = ["freeze"] - if python312_mixed_setuptools_workaround: - pip_freeze_args.extend(["--all", "--exclude", "pip"]) - result = pip(tmpdir, pip_freeze_args, merge_stderr=False).decode( - "ascii" - ) + result = pip( + tmpdir, ["freeze", "--all", "--exclude", "pip"], merge_stderr=False + ).decode("ascii") # They changed this behaviour in https://github.com/pypa/pip/pull/12032 pinned_versions = {} for line in result.splitlines():