From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2GGpMDRjS2RtNQEASxT56A (envelope-from ) for ; Fri, 28 Apr 2023 08:09:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CAiNMDRjS2QxagAA9RJhRA (envelope-from ) for ; Fri, 28 Apr 2023 08:09:56 +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 6784DB567 for ; Fri, 28 Apr 2023 08:09:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psH1c-00062b-AB; Fri, 28 Apr 2023 01:52:08 -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 1psH1Y-0005ym-J0 for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psH1Y-0003Hq-9v for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psH1Y-0006ev-5h for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63139] [PATCH python 15/20] gnu: poetry: Fix build. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 05:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63139@debbugs.gnu.org Cc: John Kehayias Received: via spool by 63139-submit@debbugs.gnu.org id=B63139.168266111125531 (code B ref 63139); Fri, 28 Apr 2023 05:52:04 +0000 Received: (at 63139) by debbugs.gnu.org; 28 Apr 2023 05:51:51 +0000 Received: from localhost ([127.0.0.1]:60313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH1K-0006dj-Rf for submit@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:51 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:61325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH1I-0006dU-FM for 63139@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:49 -0400 Date: Fri, 28 Apr 2023 05:51:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682661102; x=1682920302; bh=0OMoszzn4QIYHkG1EV4nbIuRsbSAwOluvCj26dSwMlw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=NJCi830na9dgv+1NOgTfkBikLFxegeZm7sDAwTkZL5Rq78rr5OlVBla0kH5lXek5H MXlsoYY7Rl+e9SQ78OBKcgjta0EJyID0eQOnw7iC2GqUpVAszLiPDDVRGmWwlGVfMW 6XmOJ0lTPeC07If3cAkSz9wQGojGeb1u9Ab+F7WV062xzznTu8ahtm888vkmnST8zJ lh6Zj1LDMdVcBcnAmyw6ulUbfxZ6FWicNJDIaXth2+l9tTFryyzFQ072psDUpjjfE3 0oyEuJwDTcNl+LHu9zX/PWbMMc/pGWk5RIY4mvV7QUqsOlXwXYyFBLkFkBHUbpuZ3B WdXYg1ZOmB32Q== Message-ID: In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches From: John Kehayias via Guix-patches via 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682662196; a=rsa-sha256; cv=none; b=FbklchxH9+joQJYLEQtHB+30CUOHLiTRbiZRlBy6rWrxpEsmijufpcz3KycA1jqRTQB0Gx 2BfJJeSDU9JsUOEzKmZ8EQDaP1sp6vloWFeLXdIvF92j5p9UfIBr4AUzs6hGjE+PI5BFo9 DhxLOuI9npQdrJjB7JlyBTHfgk46HRg47WD0AQIWIq0r841wsy+p4rjCdM3MXBZk1Itzji GMsEJdiBJzoC1IbMMnrn70zHGTsgz0D0lPRvbud72kc1Dek/5mKFjXDr+x2rM0HLnzmTbs eTPto0stVZj/Znk8wstHDU5lgAmZeIQmwkjqk9TzTtwF+vfF5+nWxziAt0Ea2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=NJCi830n; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682662196; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=0OMoszzn4QIYHkG1EV4nbIuRsbSAwOluvCj26dSwMlw=; b=V9fPqs8xwZ3XEYnuP+lTgfEDmCPYI8d7lWYfbTD44B7KEIznH1Q1w9B6kDH7kCog5mJdWt TJCTnp1sjxkxfg9B4CgZ2DR9Uw1SigP5yJsvBTTHSVzFRfXcbU3TmSISvxSgHV6K05IHNF z8X8AbXFAxqkVByj5RFOEtiX0HiYC2/5RrrUA9TP6bllWMUB7en36G6r4jOxJC+9bLbGRZ kzBZmCjF+9mmQqyZnZxN64YNL1Q8WLWFXXC312SfiQJB2jtHlBnnZxjtmB6jBGOtPW4xb4 6YIfxurH9Ui0woDVnt7UtquOD5J/wnVSfDS9RqZIzvW/pYaJe8gCYT4iHe+uYQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=NJCi830n; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -2.20 X-Spam-Score: -2.20 X-Migadu-Queue-Id: 6784DB567 X-TUID: 2bbfiQivMaiW * gnu/packages/python-xyz.scm (poetry)[build-system]: Switch to pyproject-build-system. [arguments]{phases}: New phase 'loosen-requirements' to fix build and avoid circular dependency. {test-flags}: Disable failing tests. [propagated-inputs]: Remove python-pip. Add python-dulwich, python-install= er, python-jsonschema, python-platfromdirs, python-pypa-build, python-pyproject-hooks, python-tomli, and python-trove-classifiers. [native-inputs]: Add python-deepdiff, python-httpretty, python-pytest, python-pytest-mock, and python-pytest-xdist. --- gnu/packages/python-xyz.scm | 62 ++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b61cba8ae..cbe3bb1094 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18144,37 +18144,75 @@ (define-public poetry (sha256 (base32 "0g0vczn6qa4b2bdkq4k7fm1g739vyxp2iiblwwsrcmw24jj81m8b")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ;PyPI does not have tests - ;; #:phases - ;; (modify-phases %standard-phases - ;; (add-before 'build 'patch-setup-py - ;; (lambda _ - ;; (substitute* "setup.py" - ;; ;; Relax some of the requirements. - ;; (("(keyring>=3D21.2.0),<22.0.0" _ keyring) keyring) - ;; (("(packaging>=3D20.4),<21.0" _ packaging) packaging))))= ) - )) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + (substitute* "pyproject.toml" + ;; Permit newer versions of platformdirs. + (("platformdirs =3D.*") "platformdirs =3D \"^3.0.0\"\= n") + ;; Our python-trove-classifiers reports the wrong ver= sion. + (("trove-classifiers =3D.*") "trove-classifiers =3D \= "*\"\n") + ;; Avoid circular dependency by not including the exp= ort + ;; plugin requirement. See + ;; + ;; and + ;; + ;; for upstream status in resolving this cycle. + (("poetry-plugin-export.*") ""))))) + #:test-flags + '(let ((disabled-tests + ;; The following tests currently fail, requiring networ= k + ;; connectivity and/or trying to write in the build + ;; environment. + ;; TODO: Some of these might be worked around. + (list "test_shell" + (string-append "test_build_backend_errors_are_" + "reported_correctly_if_caused_by_s= ubprocess") + "test_prepare_sdist" + (string-append "test_executor_should_write_" + "pep610_url_references_for_non_whe= el_files") + "test_uninstall_git_package_nspkg_pth_cleanup" + "test_builder_setup_generation_runs_with_pip_edit= able" + "test_prepare_directory" + "test_prepare_directory_with_extensions" + "test_prepare_directory_editable"))) + (list "-k" (string-append "not " + (string-join disabled-tests + " and not ")))))) (propagated-inputs (list python-cachecontrol python-cachy python-cleo python-crashtest + python-dulwich python-entrypoints python-html5lib + python-installer + python-jsonschema python-keyring python-msgpack python-packaging python-pexpect - python-pip python-pkginfo + python-platformdirs + python-pypa-build python-poetry-core + python-pyproject-hooks python-requests python-requests-toolbelt python-shellingham + python-tomli python-tomlkit + python-trove-classifiers python-virtualenv)) + (native-inputs (list python-deepdiff + python-httpretty + python-pytest + python-pytest-mock + python-pytest-xdist)) (home-page "https://python-poetry.org") (synopsis "Python dependency management and packaging made easy") (description "Poetry is a tool for dependency management and packaging -- 2.39.2