diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index ed1a787eb7a1..5349ee627470 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -11,7 +11,7 @@ pydocstyle, pyflakes, vulture, - setuptools, + setuptools_80, pylint, pytestCheckHook, }: @@ -43,7 +43,7 @@ let pycodestyle pydocstyle pyflakes - setuptools + setuptools_80 vulture ]; diff --git a/pkgs/development/python-modules/python-ldap/python-3.14.patch b/pkgs/development/python-modules/python-ldap/python-3.14.patch deleted file mode 100644 index 831296d2607e..000000000000 --- a/pkgs/development/python-modules/python-ldap/python-3.14.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c6bb3ea9d16f0e088151b87c7ff8184272aa0714 Mon Sep 17 00:00:00 2001 -From: Iwan -Date: Sat, 17 Jan 2026 15:26:55 +0100 -Subject: [PATCH] Explicitly close url file to avoid ResourceWarning in Python - 3.14 - ---- - Lib/ldap/schema/subentry.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Lib/ldap/schema/subentry.py b/Lib/ldap/schema/subentry.py -index b83d819b..3f73df71 100644 ---- a/Lib/ldap/schema/subentry.py -+++ b/Lib/ldap/schema/subentry.py -@@ -476,10 +476,10 @@ def urlfetch(uri,trace_level=0): - l.unbind_s() - del l - else: -- ldif_file = urlopen(uri) -- ldif_parser = ldif.LDIFRecordList(ldif_file,max_entries=1) -- ldif_parser.parse() -- subschemasubentry_dn,s_temp = ldif_parser.all_records[0] -+ with urlopen(uri) as ldif_file: -+ ldif_parser = ldif.LDIFRecordList(ldif_file,max_entries=1) -+ ldif_parser.parse() -+ subschemasubentry_dn,s_temp = ldif_parser.all_records[0] - # Work-around for mixed-cased attribute names - subschemasubentry_entry = ldap.cidict.cidict() - s_temp = s_temp or {}