From d09007629124e57f8c045ec8dabd12a510802435 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Jul 2026 21:02:55 +0200 Subject: [PATCH] python3Packages.wrapt: 1.17.2 -> 2.2.2 --- .../python-modules/wrapt/default.nix | 6 +- .../python-modules/wrapt/pytest9-compat.patch | 59 ------------------- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/python-modules/wrapt/pytest9-compat.patch diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 4f947d1c42d6..18a6607fbf5a 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -10,18 +10,16 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.17.2"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; tag = version; - hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c="; + hash = "sha256-m3vjzV2aM4P+PoH3w9f8swLnp4DBLz5vfCz4An/XoMQ="; }; - patches = [ ./pytest9-compat.patch ]; - build-system = [ setuptools ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wrapt/pytest9-compat.patch b/pkgs/development/python-modules/wrapt/pytest9-compat.patch deleted file mode 100644 index 8ce0b26f5b84..000000000000 --- a/pkgs/development/python-modules/wrapt/pytest9-compat.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index 318d226..0a79281 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -18,28 +18,29 @@ def construct_dummy(path, parent): - else: - return DummyCollector(path, parent=parent) - --def pytest_pycollect_makemodule(path, parent): -- if '_py33' in path.basename and version < (3, 3): -- return construct_dummy(path, parent) -- if '_py34' in path.basename and version < (3, 4): -- return construct_dummy(path, parent) -- if '_py35' in path.basename and version < (3, 5): -- return construct_dummy(path, parent) -- if '_py36' in path.basename and version < (3, 6): -- return construct_dummy(path, parent) -- if '_py37' in path.basename and version < (3, 7): -- return construct_dummy(path, parent) -- if '_py38' in path.basename and version < (3, 8): -- return construct_dummy(path, parent) -- if '_py39' in path.basename and version < (3, 9): -- return construct_dummy(path, parent) -- if '_py310' in path.basename and version < (3, 10): -- return construct_dummy(path, parent) -- if '_py311' in path.basename and version < (3, 11): -- return construct_dummy(path, parent) -- if '_py312' in path.basename and version < (3, 12): -- return construct_dummy(path, parent) -- if '_py3' in path.basename and version < (3, 0): -- return construct_dummy(path, parent) -- if '_py2' in path.basename and version >= (3, 0): -- return construct_dummy(path, parent) -+def pytest_pycollect_makemodule(module_path, parent): -+ name = module_path.name -+ if '_py33' in name and version < (3, 3): -+ return construct_dummy(module_path, parent) -+ if '_py34' in name and version < (3, 4): -+ return construct_dummy(module_path, parent) -+ if '_py35' in name and version < (3, 5): -+ return construct_dummy(module_path, parent) -+ if '_py36' in name and version < (3, 6): -+ return construct_dummy(module_path, parent) -+ if '_py37' in name and version < (3, 7): -+ return construct_dummy(module_path, parent) -+ if '_py38' in name and version < (3, 8): -+ return construct_dummy(module_path, parent) -+ if '_py39' in name and version < (3, 9): -+ return construct_dummy(module_path, parent) -+ if '_py310' in name and version < (3, 10): -+ return construct_dummy(module_path, parent) -+ if '_py311' in name and version < (3, 11): -+ return construct_dummy(module_path, parent) -+ if '_py312' in name and version < (3, 12): -+ return construct_dummy(module_path, parent) -+ if '_py3' in name and version < (3, 0): -+ return construct_dummy(module_path, parent) -+ if '_py2' in name and version >= (3, 0): -+ return construct_dummy(module_path, parent)