From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cJX7Jnq9z2SiZgEASxT56A (envelope-from ) for ; Sun, 06 Aug 2023 17:34:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id slDQJXq9z2RpPAAAG6o9tA (envelope-from ) for ; Sun, 06 Aug 2023 17:34:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 333616F249 for ; Sun, 6 Aug 2023 17:34:18 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MiDCAzti; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691336058; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PCIkfhvZVc/m4ifvM9t2DTb+1xHNutNHs94MCqbi410=; b=CqkSiqiUmQ1WutLOCP7e0Cuz2x5tjfUeAHV9DAkjuydvuV4DXOYnalbvBaY2Nhpm59u684 ko8k4gqyxiAf1KpxnoohWZCk6eb/GRDmNEGt6gbsgCYcLmC3deNLP9gqwjmTS86gR8mjZD DR5BqGoXr1mgijOwCksRTpEhAD+AMLv6Y/I3V/TG4sfA6Y301+sK3sPXHJPpmYSKtkX9yv pdpYWd6sV4dFyiH+FdUh5FRvXfElYSrwilD1nDr+Nmo6p+YYc2+sFU5jlJh6upajximqYJ llJCOaAnqRSp+nKkJXMeRnqsRJMHvoRgTL+KVGY7oUR7DSZQ1/tDMzr7dleqnw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691336058; a=rsa-sha256; cv=none; b=SOi2I9oUbirV63tVf6Ywjdw2tqebwRqOq4HOXWNyhwUV69kD6XVItebpi/NdHpu3DP1SYe BI8P3GmqMpNN5vvGp5mai8/d1keSbRReu9qlGBbeTp1A9G1SKp0WlohIEeoQ9YeSqc4dfn pycMYvKyOg7RBx6Tqb9nBy/TqZEqdeEoa/xwSu9irSpj0bxniwXemYjF5y8SCgjmYg8hUM iLO4XAK3wqaEI39EvAQrXy+vbi2I2eha7RywCbLi8cVgKMcS192XpGlfZM16hkJlG28c/B vziEowayXL0QfK0WB4Aof5FvGBlII67IBRyeW1bL9OpUjNbN1zvCTxh08MBSEg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MiDCAzti; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSflc-0007ZZ-2y; Sun, 06 Aug 2023 11:34:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSfla-0007Sg-7N for guix-patches@gnu.org; Sun, 06 Aug 2023 11:34:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSflZ-0006jS-Ui for guix-patches@gnu.org; Sun, 06 Aug 2023 11:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSflZ-0005KU-QR for guix-patches@gnu.org; Sun, 06 Aug 2023 11:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2. References: <20230806153159.285234-1-monego@posteo.net> In-Reply-To: <20230806153159.285234-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Aug 2023 15:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65114 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65114@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 65114-submit@debbugs.gnu.org id=B65114.169133602220396 (code B ref 65114); Sun, 06 Aug 2023 15:34:01 +0000 Received: (at 65114) by debbugs.gnu.org; 6 Aug 2023 15:33:42 +0000 Received: from localhost ([127.0.0.1]:59904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSflG-0005Iu-2G for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:33:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSflD-0005Id-Pk for 65114@debbugs.gnu.org; Sun, 06 Aug 2023 11:33:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9E150240103 for <65114@debbugs.gnu.org>; Sun, 6 Aug 2023 17:33:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691336013; bh=9ad5kFcOy+HKsxmztOVEpbN3eyF7WluAbBARz/7q5ME=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=MiDCAztiu7n+buvsR9dKslPtQFHF9Lpw/8JTbRajfM9PeLm3AYT7e24OaxOMC/mlH dJtvxEbMFENouGwxEbCfGwYmEDf2+AEy8mNroYorF5PcFcFs6qb9ncGAThV+QT8rAW u13ihZY57QBEDProZkW4TgIAPrePu5WbiVdf+5o5qMXiyqil+OaphEa2WN18360nmJ Iaxrw1dTBXDdEtY8KHY3cADL0Xh+EXansT24ytmcQFO/3AEot/Cdgt0I1o02tJlYxP dVNH/IJ+xvIcKpqrya5ma1/N3RFwbxYS1+eG7wxxJFlXI9/YxzrSYJG+mVKTy/HHK/ /cizDj1kpL7DA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJk4X6B40z9rxD; Sun, 6 Aug 2023 17:33:32 +0200 (CEST) From: Vinicius Monego Date: Sun, 6 Aug 2023 15:33:12 +0000 Message-Id: <20230806153317.285639-1-monego@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 333616F249 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -3.75 X-Spam-Score: -3.75 X-TUID: oQuDJQVlTQZS * gnu/packages/python-web.scm (python-w3lib): Update to 2.1.2. [source]: Remove patch. [build-system]: Use pyproject-build-system. [arguments]: Do not override the check phase. [native-inputs]: Remove python-six. * gnu/packages/patches/python-w3lib-fix-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-w3lib-fix-test-failure.patch | 60 ------------------- gnu/packages/python-web.scm | 16 ++--- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 gnu/packages/patches/python-w3lib-fix-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 77707127a7..e091b310c2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1730,7 +1730,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-shiboken-2-compat.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ - %D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ %D%/packages/patches/quodlibet-fix-invalid-glob.patch \ %D%/packages/patches/quodlibet-fix-mtime-tests.patch \ diff --git a/gnu/packages/patches/python-w3lib-fix-test-failure.patch b/gnu/packages/patches/python-w3lib-fix-test-failure.patch deleted file mode 100644 index f38fc749df..0000000000 --- a/gnu/packages/patches/python-w3lib-fix-test-failure.patch +++ /dev/null @@ -1,60 +0,0 @@ -From fae6cc40e112cd13697cb0e8d79976f32c72491d Mon Sep 17 00:00:00 2001 -From: Eugenio Lacuesta -Date: Wed, 10 Mar 2021 12:31:05 -0300 -Subject: [PATCH] [CI] Mark single add_or_replace_parameter test as xfail - ---- -This patch is based on upstream commit -fae6cc40e112cd13697cb0e8d79976f32c72491d which is part of -https://github.com/scrapy/w3lib/pull/166. - - .gitignore | 3 ++- - tests/test_url.py | 25 ++++++++++++++----------- - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/tests/test_url.py b/tests/test_url.py -index 8b07c00..0f7458e 100644 ---- a/tests/test_url.py -+++ b/tests/test_url.py -@@ -1,12 +1,14 @@ --# -*- coding: utf-8 -*- - from __future__ import absolute_import - import os - import unittest -+ -+import pytest -+from six.moves.urllib.parse import urlparse -+ - from w3lib.url import (is_url, safe_url_string, safe_download_url, - url_query_parameter, add_or_replace_parameter, url_query_cleaner, - file_uri_to_path, parse_data_uri, path_to_file_uri, any_to_uri, - urljoin_rfc, canonicalize_url, parse_url, add_or_replace_parameters) --from six.moves.urllib.parse import urlparse - - - class UrlTests(unittest.TestCase): -@@ -310,10 +311,6 @@ def test_add_or_replace_parameter(self): - self.assertEqual(add_or_replace_parameter(url, 'arg3', 'nv3'), - 'http://domain/test?arg1=v1&arg2=v2&arg3=nv3') - -- url = 'http://domain/test?arg1=v1;arg2=v2' -- self.assertEqual(add_or_replace_parameter(url, 'arg1', 'v3'), -- 'http://domain/test?arg1=v3&arg2=v2') -- - self.assertEqual(add_or_replace_parameter("http://domain/moreInfo.asp?prodID=", 'prodID', '20'), - 'http://domain/moreInfo.asp?prodID=20') - url = 'http://rmc-offers.co.uk/productlist.asp?BCat=2%2C60&CatID=60' -@@ -338,6 +335,13 @@ def test_add_or_replace_parameter(self): - self.assertEqual(add_or_replace_parameter(url, 'arg1', 'v3'), - 'http://domain/test?arg1=v3&arg2=v2') - -+ @pytest.mark.xfail(reason="https://github.com/scrapy/w3lib/issues/164") -+ def test_add_or_replace_parameter_fail(self): -+ self.assertEqual( -+ add_or_replace_parameter('http://domain/test?arg1=v1;arg2=v2', 'arg1', 'v3'), -+ 'http://domain/test?arg1=v3&arg2=v2' -+ ) -+ - def test_add_or_replace_parameters(self): - url = 'http://domain/test' - self.assertEqual(add_or_replace_parameters(url, {'arg': 'v'}), diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 17c9563cfd..24071a8553 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7752,25 +7752,17 @@ (define-public python-smart-open (define-public python-w3lib (package (name "python-w3lib") - (version "1.22.0") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "w3lib" version)) - (patches (search-patches "python-w3lib-fix-test-failure.patch")) (sha256 (base32 - "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) + "1cd4b3w5g3pfccsg79kjj27fwi216ip927rjq7isp8pfjzlp8nzd")))) + (build-system pyproject-build-system) (native-inputs - (list python-pytest python-six)) + (list python-pytest)) (home-page "https://github.com/scrapy/w3lib") (synopsis "Python library of web-related functions") (description -- 2.34.1