From 309bc80f661b2ddea2fcb11f4966743376b74d54 Mon Sep 17 00:00:00 2001 From: Milka Kuzminski Date: Tue, 26 Jan 2021 23:46:46 +0100 Subject: [PATCH] pytest: fixed package requirements for latest setuptools which breaks backward compat. --- pkgs/patches/pytest/setuptools.patch | 12 ++++++++++++ pkgs/python-packages-overrides.nix | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/patches/pytest/setuptools.patch diff --git a/pkgs/patches/pytest/setuptools.patch b/pkgs/patches/pytest/setuptools.patch new file mode 100644 index 00000000..755a8009 --- /dev/null +++ b/pkgs/patches/pytest/setuptools.patch @@ -0,0 +1,12 @@ +diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py +--- pytest-4.6.5-orig/setup.py 2018-04-10 10:23:04.000000000 +0200 ++++ pytest-4.6.5/setup.py 2018-04-10 10:23:34.000000000 +0200 +@@ -24,7 +24,7 @@ INSTALL_REQUIRES = [ + def main(): + setup( + use_scm_version={"write_to": "src/_pytest/_version.py"}, +- setup_requires=["setuptools-scm", "setuptools>=40.0"], ++ setup_requires=["setuptools-scm", "setuptools<=42.0"], + package_dir={"": "src"}, + # fmt: off + extras_require={ \ No newline at end of file diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix index 8c3b421e..51f5b3df 100644 --- a/pkgs/python-packages-overrides.nix +++ b/pkgs/python-packages-overrides.nix @@ -274,6 +274,12 @@ self: super: { ]; }); + "pytest" = super."pytest".override (attrs: { + patches = [ + ./patches/pytest/setuptools.patch + ]; + }); + # Avoid that base packages screw up the build process inherit (basePythonPackages) setuptools;