From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GFIBNa0v219HRQAA0tVLHw (envelope-from ) for ; Thu, 17 Dec 2020 10:15:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6D7fMK0v218nCwAA1q6Kng (envelope-from ) for ; Thu, 17 Dec 2020 10:15:09 +0000 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 88422940355 for ; Thu, 17 Dec 2020 10:15:09 +0000 (UTC) Received: from localhost ([::1]:34802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpqJP-0002My-C0 for larch@yhetil.org; Thu, 17 Dec 2020 05:15:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpqFT-0007L9-Rp for guix-patches@gnu.org; Thu, 17 Dec 2020 05:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpqFS-00010p-FA for guix-patches@gnu.org; Thu, 17 Dec 2020 05:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kpqFS-0007Ru-9M for guix-patches@gnu.org; Thu, 17 Dec 2020 05:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45289] [PATCHES] Fix python-sanic Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Dec 2020 10:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45289@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160819985928623 (code B ref -1); Thu, 17 Dec 2020 10:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2020 10:10:59 +0000 Received: from localhost ([127.0.0.1]:34753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpqFL-0007RW-4h for submit@debbugs.gnu.org; Thu, 17 Dec 2020 05:10:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:48796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpqFG-0007RL-R8 for submit@debbugs.gnu.org; Thu, 17 Dec 2020 05:10:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpqFG-0007Bw-Kl for guix-patches@gnu.org; Thu, 17 Dec 2020 05:10:50 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpqF2-0000lj-I6 for guix-patches@gnu.org; Thu, 17 Dec 2020 05:10:50 -0500 Received: by mail-wr1-x436.google.com with SMTP id i9so25993425wrc.4 for ; Thu, 17 Dec 2020 02:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition; bh=33Y9GJyDRSwOfhq9kPz1ggSW1JjbndKHaW3Yz4y2iho=; b=oxLepKO25H9I5NSkljrywg8fPRa4pVpyivVZZcctVFW/2H8ozM60vn6lI02Cq1eqg/ s2dy0JMrE2KSIkdlmKusewzpMHBnCt+WqTPyIXZeKxzl+cgNYB1W6QJlCb/p6KWU/Vnc Jk57r/UgRUajpGASdfa6C/Ay+/juM8QdKmw34AzyqK5SOUfPQ8OMzCf8UJ2ZoFQAm+XK LSbuaoivWHBHTd4bwJt7V7DRIVRiTx934PPCPGV5+SSqZkt/eBGADpYw4jcVkUNHVbWk lBXxlcMIHjKE+a9QNQ4OowaaBZS1wouAADTf9U+EXizPpiIjqYqwD4+/iahicQxsZonH JJAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=33Y9GJyDRSwOfhq9kPz1ggSW1JjbndKHaW3Yz4y2iho=; b=Wgi6WECpo2wgtYrRli1WaLgN8YMrhQuHd7Nlw7NyXuCQ2kXcWEqy2/rOeKloUp58d3 w2xeIpAUhkPqoXco80/3ak9I0S0SRq6IQpNRrZSzWpNBmsfs5ffsj+demWRjubwARLxZ bk5YtKjeO7vTWPUxJUZVkIWGF2sJ6fFXp7bq8mheju52N+GXXGpcDKLmFU9nnU7aaKQo UGILbaMmYfDneOMSIaRXR4aWrYMhsIsNm4nddK7b2CwSffeumhXe6Bn6+ibPv8Nn7snz wd/Qd5uGZd7g8feOEEJFLzP6v5PMM0QI81XgCLkTtGvMyNk7H4CDrd8M77LDtDrIzbyX 01Uw== X-Gm-Message-State: AOAM532MAx9b9kxU/YLmPYcz5ABsqVSNrT3HB4PL0/SHqDqCqDxD2CRr mEd9nLeTA7drMZQQmZ6d7QJNCEPTvAs54/kMndqqGi5nItp6ZUZqZb0Z28YAsFLnFd3/IT8p+iV U7QpIpHc1W6MncOylIC2XwFBmNp4fZAT1zT9Ls1wKDA/8Fm5DezpuCdz7cmwKDbUA+GGWnaZ+hp 9IUwSbZWlOYw== X-Google-Smtp-Source: ABdhPJyn32hLYrBaRXc/ljNxKugARd3MpMltLdg8gQwvzANuYl+0eX4MU6RSjrz2ioOaCuAdr/j3Ww== X-Received: by 2002:adf:f94b:: with SMTP id q11mr43237805wrr.351.1608199831204; Thu, 17 Dec 2020 02:10:31 -0800 (PST) Received: from localhost (dynamic-2a01-0c22-d4a8-1a00-f175-f7f9-2a96-8b26.c22.pool.telefonica.de. [2a01:c22:d4a8:1a00:f175:f7f9:2a96:8b26]) by smtp.gmail.com with ESMTPSA id i4sm8682072wri.88.2020.12.17.02.10.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 02:10:30 -0800 (PST) Date: Thu, 17 Dec 2020 11:10:29 +0100 From: Lars-Dominik Braun Message-ID: <20201217101029.GB2856@zpidnp36> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ABTtc+pdwF7KHXCz" Content-Disposition: inline Received-SPF: none client-ip=2a00:1450:4864:20::436; envelope-from=ldb@leibniz-psychology.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.41 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=leibniz-psychology-org.20150623.gappssmtp.com header.s=20150623 header.b=oxLepKO2; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 88422940355 X-Spam-Score: -1.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: geQozn05vQxq --ABTtc+pdwF7KHXCz Content-Type: multipart/mixed; boundary="IiVenqGWf+H9Y6IX" Content-Disposition: inline --IiVenqGWf+H9Y6IX Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, a recent change to python-httpx broke python-sanic, which the attached patch series fixes. Cheers, Lars --=20 Lars-Dominik Braun Wissenschaftlicher Mitarbeiter/Research Associate www.leibniz-psychology.org ZPID - Leibniz-Institut f=C3=BCr Psychologie / ZPID - Leibniz Institute for Psychology Universit=C3=A4tsring 15 D-54296 Trier - Germany Tel.: +49=E2=80=93651=E2=80=93201-4964 --IiVenqGWf+H9Y6IX Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-python-httpcore-Upgrade-to-0.12.2.patch" Content-Transfer-Encoding: quoted-printable =46rom 99dd608b5727a499c3937863ff09739c6cbf43ac Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Thu, 17 Dec 2020 10:59:43 +0100 Subject: [PATCH 1/2] gnu: python-httpcore: Upgrade to 0.12.2. httpx was upgraded in commit bc49b009bf08326b55aea3508a6b677a065d5a31, but was broken, because it requests this new version of httpcore. * gnu/packages/python-web.scm (python-httpcore)[version]: Upgrade to 0.12.2. [arguments]: Respect tests? argument. Disable tests. Remove obsolete phases. [native-inputs]: Remove obsolete comment regarding mitmproxy. --- gnu/packages/python-web.scm | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f88178ab2c..7a4a83f210 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4915,7 +4915,7 @@ and serve updated contents upon changes to the direct= ory.") (define-public python-httpcore (package (name "python-httpcore") - (version "0.11.0") + (version "0.12.2") (source (origin ;; PyPI tarball does not contain tests. @@ -4925,33 +4925,21 @@ and serve updated contents upon changes to the dire= ctory.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "01bhajcxqgkdzg7b7x0fqs2lwcfsajlgqwi1nlxx58jss7g2kxn9")))) + (base32 "1nrwwfdqjfc2a1k3j41cdwkprwvplf95fwmypdl2aq2qgp3209q0")))) (build-system python-build-system) (arguments - `(#:phases + `(#:tests? #f ; Tests hang at 98% + #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-unavailable-tests - (lambda _ - ;; These tests require 'mitmproxy' which is not packaged. - (for-each (lambda (f) - (delete-file f)) - '("tests/conftest.py" - "tests/sync_tests/test_interfaces.py" - "tests/async_tests/test_interfaces.py")) - #t)) - (add-after 'remove-unavailable-tests 'force-h11-version - ;; Allow build with h11 >=3D 0.10. - (lambda _ - (substitute* "setup.py" (("h11>=3D0.8,<0.10") "h11")) - #t)) (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "--cov=3Dhttpcore" - "--cov=3Dtests" "tests")))))) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (if tests? + (begin + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "--cov=3Dhttpcore" + "--cov=3Dtests" "tests")))))))) (native-inputs - `(;; ("mitmproxy" ,mitmproxy) ;; TODO: Package this. - ("python-autoflake" ,python-autoflake) + `(("python-autoflake" ,python-autoflake) ("python-flake8" ,python-flake8) ("python-flake8-bugbear" ,python-flake8-bugbear) ("python-flake8-pie" ,python-flake8-pie) --=20 2.26.2 --IiVenqGWf+H9Y6IX Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-python-sanic-Relax-httpx-version-requirement.patch" Content-Transfer-Encoding: quoted-printable =46rom be26e673556898bf4c7ec1f9dcf1fa89f4692eb5 Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Thu, 17 Dec 2020 11:04:14 +0100 Subject: [PATCH 2/2] gnu: python-sanic: Relax httpx version requirement. * gnu/packages/python-web.scm (python-sanic)[arguments]: Substitute strict httpx version requirement. --- gnu/packages/python-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7a4a83f210..097a421bad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5685,7 +5685,8 @@ as a Python package.") (substitute* "setup.py" (("httpcore=3D=3D0.3.0") "httpcore") (("pytest=3D=3D5.2.1") "pytest") - (("multidict=3D=3D5.0.0") "multidict")) + (("multidict=3D=3D5.0.0") "multidict") + (("httpx=3D=3D0\\.15\\.4") "httpx")) #t)) (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) --=20 2.26.2 --IiVenqGWf+H9Y6IX-- --ABTtc+pdwF7KHXCz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl/bLpAACgkQQhN3ARo3 hEY3lgwArAJ3kTAg4TxZx7ltDzuJ3Rp4Q89a4wLpIEy0Q3S8/DpIffe7PGKMkpaZ RM1Tb5+L/wTXjYex/QiNEKWpp6a5MaN5dYOOhRaAVsFwDEWOqzI/l0ZR1/Xm03bt TyAvsxspCEdfmEXvlaV7JBDRYyYE5KPTVwn51P6OT2tDzfQ+MhYISWo3gdyYfLFg NLz+2Jv1QivCidb3TkULD0hv0RnKxKm7213aydjXjMPEFKaPisXDDV9p/xgWxyj0 IwhoopW00ss6PInvETPMikbFmHqERap7DP+0ImJ8kOMOzCV4t24SB6adqMg1fnjw HNLUFstajoLT1b5yis3MQdX8mp8LrGLFGCdBnEiNSIsCJJL1xKq+VX7pv+OcLIfq Tlm4hD2b6x1dUdSOhPLYw6bRxF6SEfve+ARI22Wgvx4Ks6N3AnGafluxS+3qRQdY zPmQ1TY6NxasbJWX536ouTtPsIfnH2M5ugpEIM5kkzGeonbdUEbjgMi7nalyxDII YcnLEp9b =Ci1u -----END PGP SIGNATURE----- --ABTtc+pdwF7KHXCz--