From 909f4cbef50a3bf030ddef2279968d774d746554 Mon Sep 17 00:00:00 2001 From: sarahec Date: Mon, 16 Feb 2026 19:00:29 +0000 Subject: [PATCH] python3Packages.parfive: 2.2.0 -> 2.3.1 --- .../python-modules/parfive/default.nix | 15 ++++++++------- .../parfive/fix-python-3-14-compat.patch | 14 -------------- 2 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 5c2dbb3dab69..23c3cde1767d 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -23,21 +23,16 @@ buildPythonPackage (finalAttrs: { pname = "parfive"; - version = "2.2.0"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Cadair"; repo = "parfive"; tag = "v${finalAttrs.version}"; - hash = "sha256-DIjS2q/SOrnLspomLHk8ZJ+krdzMyQfbIpXxad30s1k="; + hash = "sha256-i9B860A27KDUJKlE/eQNiGVPEPvnmvmNqMjjdOeBcyY="; }; - patches = [ - # SyntaxError: 'return' in a 'finally' block - ./fix-python-3-14-compat.patch - ]; - build-system = [ setuptools-scm ]; dependencies = [ @@ -57,11 +52,17 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; + pytestFlags = [ + # https://github.com/Cadair/parfive/issues/65 + "-Wignore::ResourceWarning" + ]; + disabledTests = [ # Requires network access "test_ftp" "test_ftp_pasv_command" "test_ftp_http" + "test_problematic_http_urls" # flaky comparison between runtime types "test_http_callback_fail" diff --git a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch b/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch deleted file mode 100644 index c4be169bf6dd..000000000000 --- a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/parfive/downloader.py b/parfive/downloader.py -index 7a4116b..370ea78 100644 ---- a/parfive/downloader.py -+++ b/parfive/downloader.py -@@ -317,8 +317,7 @@ class Downloader: - task.cancel() - dl_results = await asyncio.gather(*tasks, return_exceptions=True) - -- finally: -- return self._format_results(dl_results, main_pb) -+ return self._format_results(dl_results, main_pb) - - def _format_results(self, retvals, main_pb): - # Squash all nested lists into a single flat list