From patchwork Mon Mar 1 13:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 27390 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2066B27BC4E; Mon, 1 Mar 2021 13:45:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED, URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 974D327BC4F for ; Mon, 1 Mar 2021 13:45:10 +0000 (GMT) Received: from localhost ([::1]:33108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGirF-0004mF-LB for patchwork@mira.cbaines.net; Mon, 01 Mar 2021 08:45:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGir8-0004lp-9u for guix-patches@gnu.org; Mon, 01 Mar 2021 08:45:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGir8-0005Ve-2z for guix-patches@gnu.org; Mon, 01 Mar 2021 08:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGir7-00042w-VD for guix-patches@gnu.org; Mon, 01 Mar 2021 08:45:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Mar 2021 13:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46848@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161460624715468 (code B ref -1); Mon, 01 Mar 2021 13:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Mar 2021 13:44:07 +0000 Received: from localhost ([127.0.0.1]:48521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGiq5-00040s-W0 for submit@debbugs.gnu.org; Mon, 01 Mar 2021 08:44:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:34676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGipz-00040g-09 for submit@debbugs.gnu.org; Mon, 01 Mar 2021 08:43:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGipy-0004en-Oi for guix-patches@gnu.org; Mon, 01 Mar 2021 08:43:50 -0500 Received: from mout-p-102.mailbox.org ([2001:67c:2050::465:102]:16092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1lGipt-0004lQ-1k for guix-patches@gnu.org; Mon, 01 Mar 2021 08:43:49 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Dq1gR1VCBzQkJK for ; Mon, 1 Mar 2021 14:43:31 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1614606209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gszE9nJa3Nr0ww6hptcwp9mkhmP+fxtZ+I4I9OWz0K8=; b=JlGtx7QHCUxeel9+2zXBXXgRkdkROe6GH/85isarZMdvW8j6kF7zTtIi2VrEK/HlK2BvKG hNyioSoWFYXYwJFCpDdE8EMo3DuCRh3+JCd31EI+hlt+p71GpaMuK9w3vpNtAkmxwMs9yM PNEZFF3gcJjICXOJDkDd8CK1L36pxL/bcQWP7yM2O1sWQEIiixPnWiGomfjgOfO6u0s7t6 gR3hdvj65shvfV/zYx6IZaMVMIcGqzO8aU0ZkJpnIUkwIboNYrfs2uYFQ7KsfHrLnWuN9L rKCa/qZhCstPWsQLOJ1miUb/Cnn0mQE5tAd9pmsgZoqoWwrFPg347yZWQDtESw== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id jjDxxdmqfzvB for ; Mon, 1 Mar 2021 14:43:24 +0100 (CET) Date: Mon, 1 Mar 2021 14:43:22 +0100 From: Lars-Dominik Braun Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-MBO-SPAM-Probability: X-Rspamd-Score: -8.95 / 15.00 / 15.00 X-Rspamd-Queue-Id: C071C17B4 X-Rspamd-UID: 3d4170 Received-SPF: pass client-ip=2001:67c:2050::465:102; envelope-from=lars@6xq.net; helo=mout-p-102.mailbox.org X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi everyone, the attached patches switch python-build-system to a PEP 517-based build system using python-pypa-build. As discussed previously Python is currently in the process of opening up for build systems other than setuptools using the API specified in PEP 517. python-pypa-build is a simple tool for building packages using that new API. It supports setup.py-based builds as a fallback, if no pyproject.toml is present. One downside is that this tool is not self-contained and has a few dependencies. Thus first I bootstrap setuptools using itself (possible because it bundles all of its own dependencies), then build python-pypa-build’s dependencies using setuptools (which is fortunately still possible) and then combine everything into a python-toolchain(-for-build), which is then used by the build-process. I can successfully build packages like python-pypa-build and python-pytest and python-pep517-bootstrap. The latter is using flit as its build backend. But other packages currently fail because I removed some arguments. Cheers, Lars From 4ed7eba12c80dd33f20626ddb81abc34dd667ab3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 1 Mar 2021 14:23:07 +0100 Subject: [PATCH 12/12] gnu: python-html5lib: Fix tests with pytest 6. * gnu/packages/python-web.scm (python-html5lib) [source]: Add upstream patch. [native-inputs]: Add test dependencies. [arguments]: Remove unsupported #:test-target. --- gnu/packages/python-web.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 947c200253..c484d7ba36 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1020,13 +1020,27 @@ storage.") (uri (pypi-uri "html5lib" version)) (sha256 (base32 - "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj")))) + "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj")) + (patches + (list + ;; Adds Pytest 6 support. + (origin + (method url-fetch) + (uri (string-append + "https://github.com/html5lib/" + "html5lib-python/commit/" + "2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch")) + (file-name "python-html5lib-support-pytest6.patch") + (sha256 + (base32 + "0jg2ry0439q8n7j1mf4p2hdq54i704pq9scv4wwa2pp3cwvb6dvg"))))))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) ("python-webencodings" ,python-webencodings))) - (arguments - `(#:test-target "check")) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-expect" ,python-pytest-expect))) (home-page "https://github.com/html5lib/html5lib-python") (synopsis -- 2.26.2