From db83a82fe118c3cf4a4696901bf4f29cf6361165 Mon Sep 17 00:00:00 2001 From: toofar Date: Tue, 17 Sep 2024 20:35:42 +1200 Subject: [PATCH] Include platformdirs in dev requirements as a workaround See 433074c6817daa2, this is the same cause. An older version of a package being included in requirements files because setuptools injects its vendored packages into sys.path and we use pip freeze to build lock files. Then when you install two requirements files at the same time they end up having conflicting versions. This at least means we include the latest version, which will do until we move to a method of generating lock files that just works off of the raw requirements file. --- misc/requirements/requirements-dev.txt-raw | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/misc/requirements/requirements-dev.txt-raw b/misc/requirements/requirements-dev.txt-raw index 261f4459f..fc991474c 100644 --- a/misc/requirements/requirements-dev.txt-raw +++ b/misc/requirements/requirements-dev.txt-raw @@ -7,5 +7,9 @@ pyqt-builder build twine +# Included to override setuptools' vendored version that is being included in +# the lock file by pip freeze. +platformdirs + # Already included via test requirements #@ ignore: urllib3