Commit 909f4cbe authored by sarahec's avatar sarahec Committed by Sarah Clark
Browse files

python3Packages.parfive: 2.2.0 -> 2.3.1

parent 236931b1
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -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"
+0 −14
Original line number Diff line number Diff line
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