From patchwork Sun Feb 12 23:49:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46901 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 62F4D16657; Sun, 12 Feb 2023 23:51:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5272A1664B for ; Sun, 12 Feb 2023 23:51:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRM7d-0001Xc-W6; Sun, 12 Feb 2023 18:51:06 -0500 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 1pRM7b-0001X5-AF for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:03 -0500 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 1pRM7b-0004bD-2F for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRM7a-000155-UH for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61464] [PATCH 1/2] gnu: python-construct: Update to 2.10.68. References: <20230212234832.25245-1-sharlatanus@gmail.com> In-Reply-To: <20230212234832.25245-1-sharlatanus@gmail.com> Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 23:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61464 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61464@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 61464-submit@debbugs.gnu.org id=B61464.16762458094079 (code B ref 61464); Sun, 12 Feb 2023 23:51:02 +0000 Received: (at 61464) by debbugs.gnu.org; 12 Feb 2023 23:50:09 +0000 Received: from localhost ([127.0.0.1]:47149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRM6j-00013c-9X for submit@debbugs.gnu.org; Sun, 12 Feb 2023 18:50:09 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:54082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRM6g-00012u-DP for 61464@debbugs.gnu.org; Sun, 12 Feb 2023 18:50:08 -0500 Received: by mail-wm1-f52.google.com with SMTP id u10so7591927wmj.3 for <61464@debbugs.gnu.org>; Sun, 12 Feb 2023 15:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IUGHunpb0xnPdwLFlVCCxQSJZv/ISJDyumOro1aWHko=; b=UGeRF7AOMCSdj+0iU3I/TF3qOJfxZTG8dy9qKyimUQdjasdWHf7G7fvoBD+HbmwMAD fG9dF/gHVvkNBJ0rFoUpXmKUCGHsYA6yYxOYbqzYjGK2pPnDLedlTiX3Sb4dVvGGuD9g 6VLelJX4yk/mYMOuwe+Tg6tH+Movete6NABVRfGqhlmgGWfa9CeHoiVNWzydCgxSNq8a XoH73bjMUoCL6fqhE3xGWULDUekHGDAW7jfpVtmRdM80uWUQ4H4tO/krbHYejG8do9Il VPX8qZo5p9P9ssqEPpEfmL7+5CMlc4sT1ju3EPuSNIbqvUEKLJDsv689YlDXyOXOD3N6 AxNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IUGHunpb0xnPdwLFlVCCxQSJZv/ISJDyumOro1aWHko=; b=U3OTSXm1y3rkH02Fl1YDiRlyc7U+KWm/knBIBD8X2XNwdRgvTMxOOcZjCqxksK8LVd P+tMD/AR8zpyKeyr5c2gl23yUZhUYsvvodlZIhf5eA7oPkR9VuZrf8GNRnFlEYzn4ZKk DGlB2Vqb3QmbeOmH4oeYUvDaVDxHmh9g7k+TF5mH4d+XIxLYfPUL4ZYumOW6ehY5c2po 1vVsESaXGCjO0X2y6v8A/JYtPlncraAQf7zNupd01CmjMSSZGuLtIfEcWSvTAz9IC82H Bn41qUC3Opn2l76i7KHArIQrpRhh0hkW1TKuTenCtYYTX52T9F4BeV5x3QwBINoQQQSj fshg== X-Gm-Message-State: AO0yUKWOzmoN/nUr2CdbrJKIOg9YiyPzenUecyLAuaHbjef2iyOT5zqB ZPlJXvtyI4E7ZcGmESF5ebBfuUE5pis= X-Google-Smtp-Source: AK7set9AvMh3bA/PR35wQ5cvg/hQMyYBn3dpsFYvR0xWUSfx+ZkjZF3O5RFDgQkRLVu+kUGrN6pRSQ== X-Received: by 2002:a05:600c:1656:b0:3e0:c4b:18f5 with SMTP id o22-20020a05600c165600b003e00c4b18f5mr17492504wmn.5.1676245800547; Sun, 12 Feb 2023 15:50:00 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003dfefe115b9sm13458897wmc.0.2023.02.12.15.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:50:00 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 12 Feb 2023 23:49:56 +0000 Message-Id: <20230212234957.25326-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-construct): Update to 2.10.68. [source]: Use git checkout over PyPI to enable tests. [arguments]{tests}: Enable them with custom phase. [native-inputs]: Add python-pytest, python-pytest-benchmark. [propagated-inputs]: Remove python-extras. Add python-cloudpickle, python-lz4. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 445f5a787d..1f13e3ba28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -94,7 +94,7 @@ ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021, 2022 Morgan Smith -;;; Copyright © 2021, 2022 Sharlatan Hellseher +;;; Copyright © 2021-2023 Sharlatan Hellseher ;;; Copyright © 2021 Ellis Kenyő ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Xinglu Chen @@ -24432,19 +24432,33 @@ (define-public python-attr (define-public python-construct (package (name "python-construct") - (version "2.10.56") + (version "2.10.68") (source (origin - (method url-fetch) - (uri (pypi-uri "construct" version)) + ;; There are no tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/construct/construct") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0q86jjzsvy835h3c8pjj4619vbp7ihfg8njmyw86ym4qrpni7flp")))) + (base32 "1b59kq8scxhn9afqgmksk45n53gawylqm8gw3k0vmljg274xi7vf")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ; No tests exist. + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v" "tests/"))))))) + (native-inputs + (list python-pytest python-pytest-benchmark)) (propagated-inputs - (list python-extras python-arrow python-numpy python-ruamel.yaml)) + (list python-arrow + python-cloudpickle + python-lz4 + python-numpy + python-ruamel.yaml)) (home-page "https://construct.readthedocs.io") (synopsis "Declarative and symmetrical parser and builder for binary data") (description From patchwork Sun Feb 12 23:49:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46900 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 C438716657; Sun, 12 Feb 2023 23:51:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4DE081664B for ; Sun, 12 Feb 2023 23:51:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRM7c-0001XI-Cl; Sun, 12 Feb 2023 18:51:04 -0500 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 1pRM7a-0001Wx-Se for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:02 -0500 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 1pRM7a-0004b6-KI for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRM7a-00014y-GP for guix-patches@gnu.org; Sun, 12 Feb 2023 18:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61464] [PATCH 2/2] gnu: python-capablerobot-usbhub: Update to 0.5.0. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 23:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61464 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61464@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 61464-submit@debbugs.gnu.org id=B61464.16762458094071 (code B ref 61464); Sun, 12 Feb 2023 23:51:02 +0000 Received: (at 61464) by debbugs.gnu.org; 12 Feb 2023 23:50:09 +0000 Received: from localhost ([127.0.0.1]:47147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRM6i-00013a-QC for submit@debbugs.gnu.org; Sun, 12 Feb 2023 18:50:09 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:55180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRM6g-000134-Rb for 61464@debbugs.gnu.org; Sun, 12 Feb 2023 18:50:08 -0500 Received: by mail-wm1-f53.google.com with SMTP id n13so7589144wmr.4 for <61464@debbugs.gnu.org>; Sun, 12 Feb 2023 15:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=avoNP1ijh6C2yNFDt4IRkEcBbmFw4/wrOhFU+fyzcVg=; b=qHy6f5nMwzxiViGSrRUgdxu99H8s4VdvFL0z/suKo1lkCUCx657ulxXQHYC3vlJD1v JQ++WtT3qKXtfHlRRP3kzKUExOlMDE4f8Ad7qIkhQMhdPSuvPOQd3u/OCprwA7LFnXvR GCj4ZvK74v+Zo/BWMK2fVvYEwBlN0UE0sBcNhn3Cvf+e94T2C0CdBk6/Uv561Ym1z1r9 xTMce/U3v31RJOmRU4J+4V8lzyCgcG6NFZAV6QpmEqfgpUSnfX7MzjuvhRlYe/irwvOL z2bKM3IkDYHfV7h8MFRymj4LruAS77ZER6UabN6AEDXCe3VqEpRSoe6BTQTraLE+34Jf s93w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=avoNP1ijh6C2yNFDt4IRkEcBbmFw4/wrOhFU+fyzcVg=; b=qBP2Og0OZJq/OsdsuNy65NynEvP89CeKfGd2yre+lkO50uyicqpld+LAoOAlEYahbY GvIxON7J7RL/zKkI03O4o9gtqzE38nYWZFrAXC2Htz4hMMLcwtROWxZCQnKPIyYRcmwH QCxPN5f1TJ6zABCx//n5rROpdAIEPRGEAHGMCebYMY6vb/qPQrUb9gS9AlCYJ448yVy6 ZmSvROntTwodCaJoL8Mc7/+9vpWrnG21OiaxgzHvdNPzLFxpW0sdcXjc+s3BgOQQ3+l/ NxbNBvaTfKoCG9lJ4EyW2R1C7XyQ9aCDADqM/sH8/n82q4/nd8+Rxig3RkoH/BwYUI1N pKhg== X-Gm-Message-State: AO0yUKWB3ZSDvAsBcJqUsTn/8ZI/OoWFaOfJGRmYhkit2RsJH5TL4aqJ OCOyujBuSnKQIeEHfDEzouD0fpFkk90= X-Google-Smtp-Source: AK7set9M+JajCrllo6aw0vfG1N9WGTQQMw8ZjRM519v4pVvwqvhrfnii/BAQ0Qxtmfm1GJJobo2DYA== X-Received: by 2002:a05:600c:1817:b0:3dc:405b:99bf with SMTP id n23-20020a05600c181700b003dc405b99bfmr17927413wmp.15.1676245801258; Sun, 12 Feb 2023 15:50:01 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003dfefe115b9sm13458897wmc.0.2023.02.12.15.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:50:00 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 12 Feb 2023 23:49:57 +0000 Message-Id: <20230212234957.25326-2-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230212234957.25326-1-sharlatanus@gmail.com> References: <20230212234957.25326-1-sharlatanus@gmail.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libusb.scm (python-capablerobot-usbhub): Fix build and update to 0.5.0. [source]: Use git checkout which allows to pass build the package. [build-system]: Use pyproject-build-system. [arguments]{tests}: Disable them as not provided. [phases]{use-poetry-core}: New phase. [phases]{install-udev-rules}: Remove trailing #t from lambda. [native-inputs]: Add python-poetry-core. [propagated-inputs]: python-click -> python-click-7, python-pyyaml -> python-pyyaml-5. --- gnu/packages/libusb.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index d46f1f8cc2..468f7b1753 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Christopher Howard ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 Jacob Hrbek +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages libusb) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) @@ -51,6 +53,7 @@ (define-module (gnu packages libusb) #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -310,18 +313,28 @@ (define-public python-pyusb (define-public python-capablerobot-usbhub (package (name "python-capablerobot-usbhub") - (version "0.2.7") + (version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "capablerobot_usbhub" version)) + ;; PyPI tarball fails to build. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1priic4iq2vn1rc711kzxwhxrwa508rkxrr193qdz2lw26kdhvix")))) - (build-system python-build-system) + (base32 "1nfd12612z9a9hby5dxg7lfqw5jcv3wcyqqagbg5izragni646mc")))) + (build-system pyproject-build-system) (arguments - `(#:phases + `(#:tests? #f ; No tests provided. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) (add-after 'install 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -329,10 +342,11 @@ (define-public python-capablerobot-usbhub (copy-file "50-capablerobot-usbhub.rules" (string-append out "/lib/udev/rules.d/" - "50-capablerobot-usbhub.rules")) - #t)))))) + "50-capablerobot-usbhub.rules")))))))) + (native-inputs + (list python-poetry-core)) (propagated-inputs - (list python-click python-construct python-pyusb python-pyyaml)) + (list python-click-7 python-construct python-pyusb python-pyyaml-5)) (home-page "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") (synopsis