From patchwork Wed May 12 17:42:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 29266 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 DDA0327BC83; Wed, 12 May 2021 18:43:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 7332227BC81 for ; Wed, 12 May 2021 18:43:25 +0100 (BST) Received: from localhost ([::1]:34770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgstI-00028V-K5 for patchwork@mira.cbaines.net; Wed, 12 May 2021 13:43:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgssz-00026A-3b for guix-patches@gnu.org; Wed, 12 May 2021 13:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgssy-0006Nr-Ro for guix-patches@gnu.org; Wed, 12 May 2021 13:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgssy-000534-Pt for guix-patches@gnu.org; Wed, 12 May 2021 13:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48382] [PATCH 4/6] gnu: python-pep-adapter: Update to 2.1.3. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 May 2021 17:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48382 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48382@debbugs.gnu.org X-Debbugs-Original-To: 48382@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 48382-submit@debbugs.gnu.org id=B48382.162084135319264 (code B ref 48382); Wed, 12 May 2021 17:43:04 +0000 Received: (at 48382) by debbugs.gnu.org; 12 May 2021 17:42:33 +0000 Received: from localhost ([127.0.0.1]:40436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssS-00050Y-Tn for submit@debbugs.gnu.org; Wed, 12 May 2021 13:42:33 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:38570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssQ-000509-Dd for 48382@debbugs.gnu.org; Wed, 12 May 2021 13:42:30 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FgMYx6PCJz1qtdD; Wed, 12 May 2021 19:42:29 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FgMYx6GPKz1qqwr; Wed, 12 May 2021 19:42:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Q4JoZPYpSm52; Wed, 12 May 2021 19:42:28 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-59-106.dynamic.mnet-online.de [188.174.59.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Wed, 12 May 2021 19:42:28 +0200 (CEST) Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 86B9F604FE; Wed, 12 May 2021 19:42:29 +0200 (CEST) From: Hartmut Goebel Date: Wed, 12 May 2021 19:42:16 +0200 Message-Id: X-Mailer: git-send-email 2.21.4 In-Reply-To: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> References: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> MIME-Version: 1.0 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 * gnu/packages/pep.scm (python-pep-adapter): Update to 2.1.3. [source]: Switch to new git repo. [arguments]{remove-wheel-requirement}: New phase. [native-inputs]: Add python-pytest and python-pytest-forked. [inputs]: Remove asn1c, add python-setuptools-scm. util-linux. --- gnu/packages/pep.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index e10c05ca68..04e7bedf13 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -26,12 +26,14 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages documentation) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages sequoia) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) @@ -189,16 +191,16 @@ ENGINE_INC_PATH=~a/include (define-public python-pep-adapter (package (name "python-pep-adapter") - (version "2.0.5") + (version "2.1.3") (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://pep.foundation/dev/repos/pEpPythonAdapter") - (changeset "66df0e5b9405"))) ;; r374 - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://gitea.pep.foundation/pEp.foundation/pEpPythonAdapter") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "107i1s8jf8gyhpmqcs64q9csxa3fwc8g7s57iyccqb4czw8gph6d")))) + (base32 "0ssz21p1k7xx3snmd4g3ggzq565rlzdmp90l2mph6yfp1y65p39s")))) (build-system python-build-system) (arguments `(;; Adding configure-flags does not work, running `build_ext` @@ -226,12 +228,24 @@ ENGINE_INC_PATH=~a/include (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) + #t)) + (add-before 'build 'remove-wheel-requirement + ;; we dont't build a wheel + (lambda _ + (substitute* "setup.cfg" + ((" wheel *>= [0-9.]*") "")) + (substitute* "pyproject.toml" + (("\"wheel *>=.*\"") "")) #t))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-forked" ,python-pytest-forked))) (inputs - `(("asn1c" ,asn1c) - ("boost-python" ,boost-with-python3) + `(("boost-python" ,boost-with-python3) ("libpepadapter" ,libpepadapter) - ("pep-engine" ,pep-engine))) + ("pep-engine" ,pep-engine) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("util-linux" ,util-linux "lib"))) ;; uuid.h (home-page "https://pep.foundation/") (synopsis "Python adapter for p≡p (pretty Easy Privacy)") (description "The p≡p Python adapter is an adaptor interface to the p≡p