From patchwork Wed Oct 5 17:40:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6222 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 000E427BBEA; Wed, 5 Oct 2022 18:55:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A1B1627BBE9 for ; Wed, 5 Oct 2022 18:55:26 +0100 (BST) Received: from localhost ([::1]:49934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8c9-0006mm-R4 for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:55:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8OH-00059p-FI for guix-patches@gnu.org; Wed, 05 Oct 2022 13:41:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8OE-0004p0-Gv for guix-patches@gnu.org; Wed, 05 Oct 2022 13:41:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8OD-0006s6-Vw for guix-patches@gnu.org; Wed, 05 Oct 2022 13:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 01/14] gnu: Add python-pprintpp. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499165726396 (code B ref 58310); Wed, 05 Oct 2022 17:41:01 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:40:57 +0000 Received: from localhost ([127.0.0.1]:57964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8O9-0006rg-9o for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:40:57 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8O7-0006rX-Fb for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:40:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D6C264C5F1 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:40:53 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wfn9uBNScJEl for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:40:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991620; bh=QYGUq2Whgc530UqZRaiA8obQCZHHymwFu7P5fgJjuaI=; h=From:To:Subject:Date; b=UhDgPmQsvn3mbCjXLaHJ45v0TxQgJugZqaYVkoPu/vOxtK+AKdsKA9IO5ciVlnSAl 5uHKCAk+FixAkWnR7mGqkEZUWXTPLMdo9xR43AwzlndEyKHeChVIxvOJPCTRNWZ28h bIXDTNX2Rpj1iC7b4bBg2hN8HGO1k0ncZmyoVur3QE1URtzOxxgROURw0KvjcjPyi2 xXLTYrZBEfNKEUqZR6N7ik8nAo8VXjo9a8oVitHdOF1AgDfx+/xt6DRbQTqW2RH/RL RE5FJ5gBCJ2CnfB+JrAYFciDwsOP4/HzP6EbrcEeyBOGIprlRORJt0BI1Lkh6OVYhp R4bKhNo4QG+Og== Date: Wed, 05 Oct 2022 13:40:16 -0400 Message-ID: <87lepuqidb.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-pprintpp): New variable. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) base-commit: fd6cd9de8682c7ddf96bf8deb637b1ca6cdbd205 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8575d4a67e..439765dc4f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16688,6 +16688,60 @@ (define-public python-tabulate data in Python.") (license license:expat))) +(define-public python-pprintpp + ;; Git version tags are inaccurate for this package; use the + ;; bare commit. + (let ((commit "7ede6da1f3062bbfb32ee04353d675a5bff185e0") + (revision "1")) + (package + (name "python-pprintpp") + (version (git-version "0.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wolever/pprintpp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nk935m3ig8sc32laqbh698vwpk037yw27gd3nvwwzdv42jal2li")))) + (inputs (list python-pypa-build python-hypothesis python-wheel + python-parameterized)) + (native-inputs (list python-pytest python-nose)) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" + "-m" + "build" + "--wheel" + "--no-isolation" + "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" + "--no-cache-dir" + "--no-input" + "install" + "--no-deps" + "--prefix" + #$output + whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "test.py"))))))) + (home-page "https://github.com/wolever/pprintpp") + (synopsis "Python pretty-printer") + (description + "This package is a printer for Python which pretty-prints structures. +It also attempts to print Unicode characters without escaping them.") + (license license:bsd-3)))) + (define-public python-kazoo (package (name "python-kazoo") From patchwork Wed Oct 5 17:41:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6215 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 669DA27BBEA; Wed, 5 Oct 2022 18:43:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 215AE27BBE9 for ; Wed, 5 Oct 2022 18:43:07 +0100 (BST) Received: from localhost ([::1]:36754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8QE-0006QX-88 for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:43:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8PJ-0005wR-Q7 for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8PC-00054y-EG for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8PC-0006u3-9j for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 02/14] gnu: Add python-pluggy-1.0.* gnu/packages/python-xyz.scm (python-pluggy-1.0): New variable. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499170226488 (code B ref 58310); Wed, 05 Oct 2022 17:42:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:41:42 +0000 Received: from localhost ([127.0.0.1]:57968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Or-0006t9-OZ for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:41:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:49796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Oq-0006t0-0W for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:41:40 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 47FC34C630 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:41:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2S1N4x1RGMKN for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:41:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991679; bh=i+BRdsz9BlsEBfoll3crhaAYqgDwa/CSVWgcVpR1AT8=; h=From:To:Subject:Date; b=JToH5uJHeeE3qyRerEjcLI4KbFhXQqM50pSqorMTqY+N269l66s26rQ7icKH9jicp fcHEE0tJBy0OEbxZuZkHwd0RyTIStFsX0Uy7x0gTWjvsappI82kY+SjWC/r9nonZ6j T/jLmAGpg4xN+72afh0LDJf+cP9bHYxaitWo0iBerMUkpO47SLnba6OxJjvXsLDVG6 dUXoX71a4r1vQb0MiV4mTQ5Lm4XjahqK2FxPGGy9Qe9RqNjJBTJZ0jR1mlSWCF6Ceb zsqCwmMkoIFWdHe1HIKXRQKlaaJP32B9VcOYaynqkdAIILvdRvrl6fsovgL13GvjKS ExIx5W/v/CscA== Date: Wed, 05 Oct 2022 13:41:15 -0400 Message-ID: <87ilkyqibo.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-pluggy-1.0): New variable. --- gnu/packages/python-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 439765dc4f..8a4ac37abf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14741,6 +14741,20 @@ (define-public python-pluggy (home-page "https://pypi.org/project/pluggy/") (license license:expat))) +(define-public python-pluggy-1.0 + (package + (inherit python-pluggy) + (name "python-pluggy") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pluggy" version)) + (sha256 + (base32 + "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922")))) + (inputs (list python-pypa-build python-wheel)) + (native-inputs (list python-pytest python-setuptools-scm)))) + (define-public python-plumbum (package (name "python-plumbum") From patchwork Wed Oct 5 17:41:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6214 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 50D6527BBEA; Wed, 5 Oct 2022 18:42:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0651D27BBE9 for ; Wed, 5 Oct 2022 18:42:46 +0100 (BST) Received: from localhost ([::1]:57412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8Ps-0005yL-Jw for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8PJ-0005wT-OW for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8PC-000554-Rt for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8PC-0006uA-Nr for guix-patches@gnu.org; Wed, 05 Oct 2022 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 03/14] gnu: Add python-setuptools-scm-7.* gnu/packages/python-build.scm (python-setuptools-scm-7): New variable. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499171826522 (code B ref 58310); Wed, 05 Oct 2022 17:42:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:41:58 +0000 Received: from localhost ([127.0.0.1]:57971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8P8-0006ti-17 for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:41:58 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8P5-0006tZ-SP for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:41:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4DCD54C4A1 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:41:55 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id bK3oJ2X5Q8zi for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:41:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991697; bh=LNxgOSDl+bsH7u2KCIQoQugwTSbN2KU1C9fr8LtdBaY=; h=From:To:Subject:Date; b=jezxiEFCIzqF3MlDJkxeZZvC4rCzGa42cAMajL10p42ss9GLyX1BilcntFTN/D/1G 18x9ZFvs0w4ETEwIv3DVSpNhyOG3B/UcVWy5nERE30vUmYg0AyFra0qlkIb0hDPNHT 9H03WhtwRHK9spOeRkqCCN9Q9DNl2KdOzNoQKhNWDcoJojs91y7guoIyYGb+5RRgCU 8R9+DJK4eF8TEtp3E9GdYQQWP52NmJcdVoU/cF8cqnQTIF/UXPjMzGLcXRN9H+IG8I wi65FsDgEUEEM0p/Q/XEBP56ge1owFsrUnmMCUU+RUdgtAtxMkUL6cTQtvNraENRvF UKDlgfWi6zhYQ== Date: Wed, 05 Oct 2022 13:41:33 -0400 Message-ID: <87fsg2qib6.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-build.scm (python-setuptools-scm-7): New variable. --- gnu/packages/python-build.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 9d9b07f769..e17cde16d9 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -476,6 +476,25 @@ (define-public python-setuptools-scm them as the version argument or in a SCM managed file.") (license license:expat))) +(define-public python-setuptools-scm-7 + (package + (inherit python-setuptools-scm) + (version "7.0.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "setuptools_scm" version)) + (sha256 + (base32 + "0i28zghzdzzkm9w8rrjwphggkfs58nh6xnqsjhmqjvqxfypi67h3")))) + (build-system python-build-system) + (arguments + `( ;Disabled tests to avoid extra dependencies. + #:tests? #f + #:phases (modify-phases %standard-phases + ;; Disabled sanity check to avoid extra dependencies. + (delete 'sanity-check)))) + (propagated-inputs (list python-packaging-bootstrap python-tomli)))) + (define-public python-editables (package (name "python-editables") From patchwork Wed Oct 5 17:41:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6216 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 4CA6927BBEA; Wed, 5 Oct 2022 18:45:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 ECB2E27BBE9 for ; Wed, 5 Oct 2022 18:45:00 +0100 (BST) Received: from localhost ([::1]:48672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8S4-0008W9-4C for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:45:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8QA-0006ja-FH for guix-patches@gnu.org; Wed, 05 Oct 2022 13:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8QA-0005EM-6x for guix-patches@gnu.org; Wed, 05 Oct 2022 13:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8QA-0006w0-2k for guix-patches@gnu.org; Wed, 05 Oct 2022 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 04/14] gnu: Add python-hatchling-bootstrap. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499173026583 (code B ref 58310); Wed, 05 Oct 2022 17:43:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:42:10 +0000 Received: from localhost ([127.0.0.1]:57976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8PK-0006uh-B8 for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:42:10 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8PI-0006uY-4h for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:42:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8D5644C4A1 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:42:07 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id cGZRVsBeWMTn for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:42:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991722; bh=0tzVFOJActm9IlanJ/hCGQV/c1FXBsbR+SvyRuEQM9M=; h=From:To:Subject:Date; b=g98p2Y0RR8QtQqwPVe0DosFct+1GCbW7++/4OqhBfORjMY9ZICQkKke1aqkTvWBVS +tc1p2rmMYgR5kIJm2PYafyb4mD6pYTAI6FbSvz1iiGn96CmRTJWWOx8zvELDKM0ie ZgyB0w3F+f26St2GJCZgXoXV9DVC9nb1StdMSIGQJKkOTB62VR/p4YZAJw1CzcPOzN wPuhnoN9yinlcUzdaesZrwp4yBggZQOU9xJ1rwpGqge6yC1eS5L3f7VhpoJa0M+stE MQpcRjzdOb356Vx+r3P6ikFzhWlixgcGORdG1ZllwhvEFH3Ci1ddc3cLjo2DuNSM3U JfegaxtUvlfAA== Date: Wed, 05 Oct 2022 13:41:58 -0400 Message-ID: <87czb6qiah.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-build.scm (python-hatchling-bootstrap): New variable. --- gnu/packages/python-build.scm | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index e17cde16d9..f90d23874f 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -516,3 +516,66 @@ (define-public python-editables ``editable mode''. In other words, changes to the package source will be reflected in the package visible to Python, without needing a reinstall.") (license license:expat))) + +;; This depends on packages in python-xyz.scm: +;; python-version, python-importlib-metadata, python-pathspec, +;; python-pluggy-1.0, and python-platformdirs. +(define-public python-hatchling-bootstrap + (package + (name "python-hatchling-bootstrap") + (version "1.10.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pypa/hatch") + (commit (string-append "hatchling-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + ;;"1q25kqw71g8mjwfjz9ph0iigdqa26zzxgmqm0v0bp0z1j8rcl237" + "1yqkwck2aihfdm9ljv5q4nygmmqyp35xwyp8lqn2f4vq9p6njq3c")))) + ;; python-pypa-build needed for bootstrapping. + ;; Otherwise we get a circular reference: + ;; python-hatchling trying to build itself, without + ;; first having hatchling installed. + (inputs (list python-pypa-build + python-editables + python-importlib-metadata + python-version + python-packaging-next + python-pathspec + python-pluggy-1.0 ;TODO: Not detected by pytest? + python-tomli + python-platformdirs)) + (build-system python-build-system) + (arguments + `( ;Tests depend on module python-hatch, which this + ;; is bootstrapping. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (chdir "backend") + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" + "-m" + "build" + "--wheel" + "--no-isolation" + "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" + "--no-cache-dir" + "--no-input" + "install" + "--no-deps" + "--prefix" + (assoc-ref %outputs "out") + whl))))))) + (home-page "https://ofek.dev/projects/hatch/") + (synopsis "Bootstrap binaries to build @code{python-hatch}") + (description "Bootstrap binaries to build @code{python-hatch}") + (license license:expat))) From patchwork Wed Oct 5 17:46:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6219 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 AE18627BBEA; Wed, 5 Oct 2022 18:49:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 63D9C27BBE9 for ; Wed, 5 Oct 2022 18:49:53 +0100 (BST) Received: from localhost ([::1]:48646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8WU-0001Pl-Rp for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8U3-0001GK-Sq for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8U2-00071Y-H2 for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8U2-00073m-8Q for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 05/14] gnu: Add python-hatch. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499197327042 (code B ref 58310); Wed, 05 Oct 2022 17:47:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:46:13 +0000 Received: from localhost ([127.0.0.1]:57988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8TF-000725-5D for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:13 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8TD-00071x-Ok for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:12 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3AD6B4C694 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:10 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sCXhUSA7hFXA for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991968; bh=iJDhqJkvmPn06e89JBywFr3PcF4FuzWZRHg2R1dr7eo=; h=From:To:Subject:Date; b=Wlr6T07qp2rh8JG4IKHZwtJ5vtpCBbPLovRqMcctNmyOPzzHbrl9uBkGGcfTj/n2n dleFW6hV67ydImkGsMKdNF2ywyZPva0YQIZVOLYcRAuqudHx9Iybsz0nz5II2BIj9i nGLolioz0Jnhgoj/in1yfqlkzrbfC40rZrz7UmSdufj1wn8gHdIJmRJJ8R4ODRdJNx OCfSWHFcbwbSCkJT5tp3A7zVRtYNndyJm0x1ohZJ0lCK7PburcHTNkt0b4QwVB3CRk Jjrn/LNzG/atL5ECLXdhdBB/W/iJQcQIpHMxQo5v1vOdMLE3CffVD6TReM73ckR1tu BObjmE1w9K1Vg== Date: Wed, 05 Oct 2022 13:46:04 -0400 Message-ID: <878rluqi3n.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index f90d23874f..0b8d8a7647 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -579,3 +579,64 @@ (define-public python-hatchling-bootstrap (synopsis "Bootstrap binaries to build @code{python-hatch}") (description "Bootstrap binaries to build @code{python-hatch}") (license license:expat))) + +(define-public python-hatch + (package + (name "python-hatch") + (version "1.10.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pypa/hatch") + (commit (string-append "hatch-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "030yi9hw50mn899pq073lw2a55r57skl2g9agjp3b4l95f3nay30")))) + (inputs (list python-pypa-build + python-editables + python-importlib-metadata + python-version + python-packaging-next + python-pathspec + python-pluggy-1.0 ;TODO: Not detected by pytest? + python-hatchling-bootstrap + python-tomli + python-platformdirs + python-rich + python-tomli-w)) + (build-system python-build-system) + (arguments + `( ;Tests appear to be written such that the input python-pluggy-1.0 is + ;; not detected. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "hatchling" "build"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" + "--no-cache-dir" + "--no-input" + "install" + "--no-deps" + "--prefix" + (assoc-ref %outputs "out") + whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (chdir "tests") + (invoke "pytest" "-vv")))) + ;; Can't have hatch as a requirement of itself. + (delete 'sanity-check)))) + (home-page "https://ofek.dev/projects/hatch/") + (synopsis "Python build system with project generation") + (description + "Python build system with project generation. It also defines a specific +syntax in @code{toml} files to check for dependencies.") + (license license:expat))) From patchwork Wed Oct 5 17:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6220 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 2900C27BBEA; Wed, 5 Oct 2022 18:51:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 D8F6727BBE9 for ; Wed, 5 Oct 2022 18:51:19 +0100 (BST) Received: from localhost ([::1]:37852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8YA-0002vN-Hb for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:51:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8U4-0001GZ-9u for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8U3-00072G-Sa for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8U2-00073u-NZ for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 06/14] gnu: Add python-hatch-vcs. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499198927071 (code B ref 58310); Wed, 05 Oct 2022 17:47:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:46:29 +0000 Received: from localhost ([127.0.0.1]:57991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8TU-00072Z-KA for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:28 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8TT-00072Q-93 for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:27 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9A3584C4A1 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:26 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id 0YVaixFHUtwv for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991985; bh=93iz4W0jCs+m+w+cNmZvvMUtraL7iHDSLwAfXJyqqYs=; h=From:To:Subject:Date; b=Hd1T4eccm6yEmI2SU85YrzC9FxWAWfnimovi7oS5dhtb3aOsJnUq3D31TNwCx1EWU j63RXmJHxO7+6YtfCj6VwZrSIK26Y8XkiMZvZ9Ecs0L2Fr9dbtE7U7pqd7pnrx0Oz/ ZJrFhq/I+zwfFzJY8ND4vh1V1hytYN1+DCYND2Jw0/Xzc/qwzRMEggB3UNvGFlnp8E 5MJnRSAEtO9SNf9QYiVMQ6oMQ4M9VanhG0ZSNPz6p1xsx7KAPmGzdulJtekoA0eD2r 93X6Saj+/iK70bY9oesT/uDbCv30tG9l0Lg5FEISrpw8DSGNx0VpPbI3QnLfMKKeYE jvIhr445IJDQg== Date: Wed, 05 Oct 2022 13:46:20 -0400 Message-ID: <875ygyqi37.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8a4ac37abf..5739c759de 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27391,6 +27391,66 @@ (define-public python-versioneer process.") (license license:public-domain))) +(define-public python-hatch-vcs + ;; Tags are not accurate; just use the commit itself. + (let ((commit "367daedb23ba906f3e0714c64392fdd6ffa69ab2") + (revision "1")) + (package + (name "python-hatch-vcs") + (version (git-version "0.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ofek/hatch-vcs") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nlnv32jqiz8ikc013h5simmiqqg0qa7pm0qcbd8yiqq1p43iw05")))) + (build-system python-build-system) + (inputs (list python-pypa-build + python-pathspec + python-pluggy-1.0 + python-editables + git + python-hatchling-bootstrap + python-typing-extensions)) + (native-inputs (list python-pytest + ;; python-setuptools-scm-6.4 minimum + python-setuptools-scm-7)) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" + "-m" + "build" + "--wheel" + "--no-isolation" + "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" + "--no-cache-dir" + "--no-input" + "install" + "--no-deps" + "--prefix" + #$output + whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vvv"))))))) ;) + (home-page "https://ofek.dev/projects/hatch/") + (synopsis "Plugin for @code{python-hatch} to include versions") + (description + "This plugin defines a version-control syntax for use with +@code{toml} files intended for use with @code{python-hatch}.") + (license license:expat)))) + (define-public python-gamera (package (name "python-gamera") From patchwork Wed Oct 5 17:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6223 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 027B427BBEA; Wed, 5 Oct 2022 18:56:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B643227BBE9 for ; Wed, 5 Oct 2022 18:56:19 +0100 (BST) Received: from localhost ([::1]:32828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8d0-0007e9-Rf for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:56:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8U3-0001GG-Po for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8U3-000724-FV for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8U3-000740-7Y for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 07/14] gnu: Add python-pytest-icdiff. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499200727104 (code B ref 58310); Wed, 05 Oct 2022 17:47:03 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:46:47 +0000 Received: from localhost ([127.0.0.1]:57994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Tn-000736-0d for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:47 -0400 Received: from knopi.disroot.org ([178.21.23.139]:60966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Tj-00072v-64 for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:45 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 843EA4C6D4 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:42 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rjNgn8UgpYND for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664991999; bh=UvWSre7o6zPfTX+JP9dngVrVsdDgiR/a0oHSuEPTyeU=; h=From:To:Subject:Date; b=f5Ua7TOOYATEb2p84DNjh1lP8z+iJV7mr7DSlnDKBrb2p9yUJ0FmMeBl1Grqy62fd svftGTbQVg8indvmhguquwnkbSa3z/YvnYemXOkbDina+G4vEeo3n8kWmQBLsdge59 j0o2zNAAcdK1GENmfHsV3crnAntbDs+B0zZwBncogVXfC3OFCmKk5k851Qkz3Hcrv7 L8blWdMsk/p6qtFJ0/KBZVuhTxEnV95INLYs5y/gAw/TgRi15L/wBw1sGEyzFhgniO a56Xju4PzxswzKxJkz+xAsA0RTyXgRlMNgjZ5RVSNqRYx4tOsrs8YsqFje2tMgHcVz sHewOx02USQmw== Date: Wed, 05 Oct 2022 13:46:36 -0400 Message-ID: <8735c2qi2r.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 2358e7448d..6d0885d6dc 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Felix Gruber ;;; Copyright © 2022 Tomasz Jeneralczyk +;;; Copyright © 2022 Garek Dyszel ;;; ;;; This file is part of GNU Guix. ;;; @@ -182,6 +183,26 @@ (define-public python-pytest-csv it adds to the Pytest command line interface (CLI).") (license license:gpl3+))) +(define-public python-pytest-icdiff + (package + (name "python-pytest-icdiff") + (version "0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-icdiff" version)) + (sha256 + (base32 + "1b8vzn2hvv6x25w1s446q1rfsbdik617lzpal3qb94x8a12yzwg8")))) + (build-system python-build-system) + (propagated-inputs (list python-pypa-build python-icdiff python-pprintpp)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/hjwp/pytest-icdiff") + (synopsis "Colored diffs using @code{python-icdiff} for pytest output") + (description + "This package uses @code{python-icdiff} to add color to the output of +pytest assertions.") + (license (license:non-copyleft "LICENSE")))) + (define-public python-testfixtures (package (name "python-testfixtures") From patchwork Wed Oct 5 17:46:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6218 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 B6F6227BBE9; Wed, 5 Oct 2022 18:49:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 33D5627BBEA for ; Wed, 5 Oct 2022 18:49:34 +0100 (BST) Received: from localhost ([::1]:48642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8WT-0001Og-2T for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:49:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8U4-0001Ge-BR for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8U3-00072H-Tn for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8U3-000748-O0 for guix-patches@gnu.org; Wed, 05 Oct 2022 13:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 08/14] gnu: Add python-hatch-fancy-pypi-readme. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499201827129 (code B ref 58310); Wed, 05 Oct 2022 17:47:03 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:46:58 +0000 Received: from localhost ([127.0.0.1]:57997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Ty-00073V-Cz for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:58 -0400 Received: from knopi.disroot.org ([178.21.23.139]:35586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Tw-00073L-1a for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:46:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 723954C4A1 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:55 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PmgYqvwR4Y0m for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:46:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992013; bh=025R1aB38/C3JDyWYaKZLXQgsKdO9htYG965VXryynw=; h=From:To:Subject:Date; b=PZdye2HXPhjhwnw5fBneQHKPSm8DM6TBcsS/ODyl6HUqVLPNltPe+Zk2XTwY4mU08 zCbwBweAHAFfzD62O/VwuF3snlJk3FMwIcS05P42AJ9NWDj0LV9XpGoAf+fOIE72cG KyH8ykN0PEXnV1jVw3+lkoVRDgu4Bj2DkiCEyzVWmaVKxZraNBg0e7TV7O2/RfaOBW bQIVzliRFendVM+HG/uvfVattYkQJ0Kf+gkK5AfFTJDdt+tS8oR3n1npBnzJOt0UZ4 5oDWRzQ92vFidquZFlIwlsdo2alEVULLvR2bdejxZf5PAABXgbozRh0nJ2l4K4WeiT VVqRmIzp42HWg== Date: Wed, 05 Oct 2022 13:46:50 -0400 Message-ID: <87zgeap3hx.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5739c759de..8ee2da0a07 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30074,6 +30074,74 @@ (define-public python-style a port of the chalk package for javascript.") (license license:expat))) +(define-public python-hatch-fancy-pypi-readme + (package + (name "python-hatch-fancy-pypi-readme") + (version "22.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "hatch_fancy_pypi_readme" version)) + (sha256 + (base32 + "1ykfz1sbz58xbjw5k9xpmn5r6ji16w8vag47j8f969bqy3w52ikx")))) + (build-system python-build-system) + (propagated-inputs (list python-tomli python-typing-extensions)) + (native-inputs (list python-pypa-build + python-pathspec + python-pluggy-1.0 + python-editables + python-hatch + python-hatchling-bootstrap + python-wheel + python-pytest + python-pytest-icdiff)) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'build 'disable-broken-tests + (lambda _ + ;; Skip the tests for "building". Guix already does this, + ;; so we don't need to test it for this package. + (chdir "tests") + (invoke "sed" "-i" + "11ipytest.skip('No need to test\ + building; guix does this already', allow_module_level=True)" + "test_end_to_end.py") + (chdir "../"))) + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" + "-m" + "build" + "--wheel" + "--no-isolation" + "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" + "--no-cache-dir" + "--no-input" + "install" + "--no-deps" + "--prefix" + (assoc-ref %outputs "out") + whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (home-page + "https://github.com/hynek/hatch-fancy-pypi-readme") + (synopsis "Syntax for styling PyPI READMEs") + (description + "Defines a syntax for the python-hatch build system, intended for styling +READMEs for PyPI.") + (license license:expat))) + (define-public python-sre-yield (package (name "python-sre-yield") From patchwork Wed Oct 5 17:47:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6221 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 C871E27BBEA; Wed, 5 Oct 2022 18:52:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 89CAA27BBE9 for ; Wed, 5 Oct 2022 18:52:37 +0100 (BST) Received: from localhost ([::1]:34168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8ZQ-0004QV-Kg for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8V6-0001gw-1X for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8V0-00077T-8Y for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8V0-00077U-3h for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 09/14] gnu: python-jsonschema-next: Update to 4.16.0. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499203127200 (code B ref 58310); Wed, 05 Oct 2022 17:48:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:47:11 +0000 Received: from localhost ([127.0.0.1]:58004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8UA-00074e-Sc for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:47:11 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8U8-00074V-Uo for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:47:09 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4D2AF4C694 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:47:08 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v0Iv04Cw2s6h for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:47:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992027; bh=E4mxjMhgjHhgV/hrQn7v+PN8rdqMhkvuG3iBtADVbu0=; h=From:To:Subject:Date; b=ADVesXmEPwglL+p/TRv5Q0ywy4fP+zBnY2dhRtrLhSUGkDxFO3NJZ1uTwxsTE8Q1L ldK4oVexYUaROh8ZsXAQbWO8KlNKwg8oj0RKzTWb+1m8yE9/73IvxX2I3OCqq7JGcd lkpcUuujW2b4o8ntjdcvKmhLKiJGkZnflue6cWLCuRUq/lucHrH2/1wGTCXLeSgwsY EL7vsOvu8+F0D4TJNbJKGGtRNcySvDbKI6/9P+rY6zfl409tjAHCES55mhk2P0FCHO OAYdiVsAvDnmxOJLlqAqHfEWqZPVZ/XZmIpzry45xX1K1SV9vhpypvhxMWeNQcgSLg twNsdxeO/qg+Q== Date: Wed, 05 Oct 2022 13:47:03 -0400 Message-ID: <87wn9ep3hk.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8ee2da0a07..e1da4386e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3631,13 +3631,13 @@ (define-public python-jsonschema (define-public python-jsonschema-next (package (inherit python-jsonschema) - (version "4.5.1") + (version "4.16.0") (source (origin (method url-fetch) (uri (pypi-uri "jsonschema" version)) (sha256 - (base32 "1z0x22691jva7lwfcfh377jdmlz68zhiawxzl53k631l34k8hvbw")))) + (base32 "07pyh8g4csapkfjgjww7vkxwvh1qwxwqxz82wm2b1kmxj69rgx11")))) (arguments (substitute-keyword-arguments (package-arguments python-jsonschema) ((#:phases phases) @@ -3655,13 +3655,23 @@ (define-public python-jsonschema-next (invoke "pip" "--no-cache-dir" "--no-input" "install" "--no-deps" "--prefix" #$output whl)))))))) (native-inputs (list python-pypa-build - python-setuptools-scm - python-twisted)) + python-twisted + python-hatch + python-hatchling-bootstrap + python-pathspec + python-pluggy-1.0 + python-editables + python-hatch-vcs + python-setuptools-scm-7 + python-hatch-fancy-pypi-readme)) (propagated-inputs (list python-attrs python-importlib-metadata python-pyrsistent - python-typing-extensions)))) + python-typing-extensions + python-hatch-vcs)) + (home-page + "https://github.com/python-jsonschema/jsonschema"))) (define-public python-schema (package From patchwork Wed Oct 5 17:47:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6217 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 6CCC127BBE9; Wed, 5 Oct 2022 18:49:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0A65E27BBE9 for ; Wed, 5 Oct 2022 18:49:34 +0100 (BST) Received: from localhost ([::1]:48704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8WT-0001y8-2M for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:49:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8V5-0001gx-Tn for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8V0-00077U-K5 for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8V0-00077b-Fv for guix-patches@gnu.org; Wed, 05 Oct 2022 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 10/14] gnu: Add ocaml-atd. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499204827230 (code B ref 58310); Wed, 05 Oct 2022 17:48:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:47:28 +0000 Received: from localhost ([127.0.0.1]:58007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8US-000758-63 for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:47:28 -0400 Received: from knopi.disroot.org ([178.21.23.139]:42186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8UQ-000750-Bh for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:47:26 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C21534C694 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:47:25 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oJQsJPABW1jg for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:47:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992044; bh=Adyc9qHO+hNUKMtpCoWOjRa+6PCzs4cEV6fXkvcOA1I=; h=From:To:Subject:Date; b=Dtb7grwLInZdvoDJZ6wxY0Kv98xQ228/HBDdPziMSlI4zjehlF4rXC0Q+n2816NN0 GOAu7At/T7w7mjT2w11tSm2l0uGAG4/y9E6M532LVtv4So/VQ02ynlD7VrCTu5QfaG otHyzVi7sSdfsPnQFbv+pXq6TvIZmaf6qAjLnHCHZrQ0UE4eYRktWwi/AHExaoAd0p gj46YEO1ywFGoNL2osLiqe9DuJAj2uZjINoY/OXQiwGZFf7A7VOulDDO/ym5zeUKFk 5fPIfBS0XC8oFi/3/s3UyLPHtAbGAFeYRiftxbTO/h3HMzRgpnO2PP2RK0QhJO4RYd okaxIQbTJqJ5A== Date: Wed, 05 Oct 2022 13:47:21 -0400 Message-ID: <87tu4ip3h2.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4bc159481e..bc876d60a1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4955,6 +4955,58 @@ (define-public ocaml-earley is also support for writing OCaml syntax extensions in a camlp4 style.") (license license:cecill-b))) +(define-public ocaml-atd + (package + (name "ocaml-atd") + (version "2.10.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrefs/atd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10fgahdigrl01py0k0q2d6a60yps38q96dxhjnzm9jz4g931716l")))) + (build-system dune-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; The dune-build-system does not run "make test" but + ;; "dune runtest test --release". + ;; This project, rather, needs us to run "make test". + ;; + ;; For this package (ocaml-atd), we DO NOT run all the + ;; tests. The atd repository has resources for several + ;; different interfaces (python, scala, etc), but we + ;; don't need to run those tests if we are just + ;; interested in the ocaml interface. + ;; So we stick with just the ocaml tests here. + (when tests? + (invoke "make" "test-ocaml"))))))) + (propagated-inputs (list ocaml-menhir + ocaml-easy-format + ocaml-odoc + ocaml-re + ocaml-camlp-streams + ocaml-biniou + ocaml-yojson + ocaml-cmdliner)) + (native-inputs (list ocaml-alcotest + python-pypa-build + python-jsonschema-4.15 + python-flake8 + python-mypy + python-pytest)) + (inputs (list python)) + (home-page "https://github.com/ahrefs/atd") + (synopsis "Parser for the ATD data format description language") + (description + "ATD is an OCaml library providing a parser for the Adjustable Type +Definitions language.") + (license (license:non-copyleft "LICENSE.md")))) + (define-public ocaml-timed (package (name "ocaml-timed") From patchwork Wed Oct 5 17:51:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6227 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 4AF0727BBEA; Wed, 5 Oct 2022 19:09:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0739E27BBE9 for ; Wed, 5 Oct 2022 19:09:12 +0100 (BST) Received: from localhost ([::1]:52662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8pT-0001h3-62 for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 14:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0004FW-3n for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8Ys-0007mx-Nn for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8Ys-0007G6-FI for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 11/14] gnu: Add ocaml-elpi. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499227727775 (code B ref 58310); Wed, 05 Oct 2022 17:52:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:51:17 +0000 Received: from localhost ([127.0.0.1]:58017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Y9-0007Dv-26 for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:17 -0400 Received: from knopi.disroot.org ([178.21.23.139]:37478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Y6-0007Dj-N3 for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:15 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 08CA64C694 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:14 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cYJbPbni-Cjq for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992272; bh=W08OVG0VIRHx1BjtBn7P6kNhM8ue4FjIWNBLh3Wa2uY=; h=From:To:Subject:Date; b=OEU8oBkVQGhLc4YtfQvGll4WXClUFZH4sQ86I33ytQug5QRDn9Y7DZyl/ntjRQqB6 fqYkCBk1wO8B5wiqDWgBJ517elwBGmJYYB/2gjkACpgjxHdtJ5Cpn2yF0OxxAmtYe5 ojZm6YlW6ltAnxGXeavLZ9NjsToxlSEx83w8L4CKGHYMnHdhbpjDYMfyBxUvtKczZ2 tD//4oVIGiQMtWnCvWM6NzEWF652xCF8XynH2LXQw62/O+Cv9wR/8Xfe65W0vNUdMq RF1scXvCxgrfpImrxPtraX2TlP/sLSyXLtubG8ORE7bs63o9Mckchtkb+WgEnJ/Oa4 hm1X/S2wyco9g== Date: Wed, 05 Oct 2022 13:51:08 -0400 Message-ID: <87r0zmp3ar.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bc876d60a1..641a139e51 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5007,6 +5007,54 @@ (define-public ocaml-atd Definitions language.") (license (license:non-copyleft "LICENSE.md")))) +(define-public ocaml-elpi + (package + (name "ocaml-elpi") + ;; For more information on which version works with Coq 8.16, + ;; see the relevant issue: + ;; https://github.com/math-comp/hierarchy-builder/issues/297 + ;; Here we use + ;; coq-elpi 1.15.4 + ocaml-elpi 1.16.5 + + ;; coq-mathcomp-hierarchy-builder 1.3.0 (Coq 8.16). + ;; (version "1.15.2") + (version "1.16.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LPCIC/elpi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + ;; "0swzqabwrxqb6sz8zpild2lfcnk3l0zxi9fw61dy2g1pzws2j2jy") + "1l6grpglkvyyj0p01l0q5ih12lp4vizamgj7i63ig82gqpyzk9dl")))) + (build-system dune-build-system) + (arguments + `(#:test-target "tests")) + ;; Build currently fails with error (repeated several times): + ;; 'Warning 6 [labels-omitted: label argsdepth was omitted in the + ;; application of this function.' + (propagated-inputs (list ocaml-stdlib-shims + ocaml-ppxlib + ocaml-menhir + ocaml-re + ocaml-ppx-deriving + ocaml-atd + ocaml-camlp-streams + ocaml-biniou + ocaml-yojson)) + (native-inputs (list ocaml-ansiterminal ocaml-cmdliner time)) + (home-page "https://github.com/LPCIC/elpi") + (synopsis "ELPI - Embeddable λProlog Interpreter") + (description + "ELPI is an extension language for OCaml. It implements a variant of +λProlog enriched with Constraint Handling Rules, a programming language for +manipulating syntax trees with binders. + +This package provides both a command line interpreter, elpi, and an OCaml +library with the same name.") + (license license:lgpl2.1+))) + (define-public ocaml-timed (package (name "ocaml-timed") From patchwork Wed Oct 5 17:51:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6224 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 66C2127BBEA; Wed, 5 Oct 2022 18:58:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 DEB4F27BBE9 for ; Wed, 5 Oct 2022 18:58:32 +0100 (BST) Received: from localhost ([::1]:57146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8fA-0001W0-16 for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0004Fh-Lo for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0007n2-9R for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8Ys-0007GE-Ty for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 12/14] gnu: Add coq-elpi. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499229127816 (code B ref 58310); Wed, 05 Oct 2022 17:52:02 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:51:31 +0000 Received: from localhost ([127.0.0.1]:58020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8YM-0007EX-H3 for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:41422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8YL-0007EP-6z for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:29 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8AA784C647 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:28 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FR9wEmt5t-HX for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992286; bh=DlOOPkfyOUsccmE1K7unOuRNr6doVc9LSlcX/kgPjro=; h=From:To:Subject:Date; b=boowvF4zP6sLeiX1sAGvgESi3Men86S9aJptShWeI2e9lgq+bzO8JA9yDt/qVf+/G m2dEvFnENqP/XbtMi7BEanFCgilkuXUqdZEAZNd9v1oGC+KlfEp5ROMXK6W9qP1piK BODtANphuGpK+XyJO6HFiI1Es6SbXcMXe38J/Z4vRN4qdhNuFCzAv/GFc5eO50PVyX IfqFdaowg1ZrDE3bT2oGSaE2ir/EPJYdKFGJyfPADFCEtdJIZMzAb7GeraFVA2igQ6 XJmBVZ809w6BrJQXky+eFa+qlhjQWddUi3ydhPElSdoxAcbG5NHb+SSqW04CtSOiJs YwgeMdDMdv6XA== Date: Wed, 05 Oct 2022 13:51:23 -0400 Message-ID: <87o7uqp3ac.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 60937af750..313366cb11 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -771,3 +771,75 @@ (define-public coq-mathcomp-bigenough purposes as @code{bigenough} will be subsumed by the near tactics. The formalization is based on the Mathematical Components library.") (license license:cecill-b))) + +(define-public coq-elpi + (package + (name "coq-elpi") + ;; For more information on which version works with Coq 8.16, + ;; see the relevant issue: + ;; https://github.com/math-comp/hierarchy-builder/issues/297 + ;; Here we use + ;; coq-elpi 1.15.4 + ocaml-elpi 1.16.5 + + ;; coq-mathcomp-hierarchy-builder 1.3.0 (Coq 8.16) + (version "1.15.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LPCIC/coq-elpi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "115ll1g5dyn8z58x7xg6nsliga669875s560j5053flr6cvb8mq1")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags ,#~(list (string-append "COQBIN=" + #$(this-package-input "coq-core") + "/bin/") + (string-append "ELPIDIR=" + #$(this-package-input "ocaml-elpi") + "/lib/ocaml/site-lib/elpi") + (string-append "COQMF_COQLIB=" + (assoc-ref %outputs "out") + "/lib/ocaml/site-lib/coq") + (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) + + #:phases (modify-phases %standard-phases + (delete 'configure) + ;; --- old phase from version 1.14.0 + (add-before 'build 'remove-extra-src-file + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove the useless line "src/META.coq-elpi" + ;; in file _CoqProject. The file + ;; src/META.coq-elpi does not exist in the + ;; repository, so this line inhibits compilation + ;; unnecessarily. + (invoke "sed" "-i" "s|src/META.coq-elpi||g" + "_CoqProject"))) + (replace 'check + ;; Error when running the "check" phase: + ;; "make: *** No rule to make target 'check'. + ;; Stop." + ;; Tests run if we invoke "make test" instead. + (lambda* (#:key tests? make-flags #:allow-other-keys) + (when tests? + (apply invoke "make" "test" make-flags))))))) + (propagated-inputs (list ocaml + ocaml-stdlib-shims + ocaml-elpi + ocaml-zarith + coq-core + coq-stdlib)) + (inputs (list python)) + (home-page "https://github.com/LPCIC/coq-elpi") + (synopsis "Elpi extension language for Coq") + (description + "Coq-elpi provides a Coq plugin that embeds ELPI, an extension language +for OCaml that is an implementation of λProlog. It also provides a way to +embed Coq's terms into λProlog using the Higher-Order Abstract Syntax approach +and a way to read terms back. In addition to that it exports to ELPI a set of +Coq's primitives. Finally it provides a way to define new vernacular commands +and new tactics.") + (license license:lgpl2.1))) From patchwork Wed Oct 5 17:51:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6225 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 E4C9627BBEA; Wed, 5 Oct 2022 18:59:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7C50E27BBE9 for ; Wed, 5 Oct 2022 18:59:08 +0100 (BST) Received: from localhost ([::1]:33362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8fj-000275-Ki for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0004Fj-OZ for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0007n4-GD for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8Yt-0007GM-Bw for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 13/14] gnu: Add coq-mathcomp-hierarchy-builder. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499230927860 (code B ref 58310); Wed, 05 Oct 2022 17:52:03 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:51:49 +0000 Received: from localhost ([127.0.0.1]:58023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Yf-0007FI-1I for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:49 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Yd-0007FA-2z for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:51:47 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7FCE04C6BD for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:46 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BbamnLWxMMiT for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992305; bh=yocTBlqnywT95u/6Yz0IgzHcUrZsJcI6PIQmQjjhzAM=; h=From:To:Subject:Date; b=DNy8OV8vbyiknU/+pdDMeP50m7ilMU6za+8HA0ye6u+2yIm/toLPrr/RRnH3bfmDO V3dwqceJRxRUNh9dK+f81fNysjWXqmVkMTM3yW2DapKS+h2fvdRbBP/8RY+XBQSDRU aOxzs+D/AYm2htCpH3sboVOYDzVCRQaY38yWRqMPGO4NNGt2tZ39l2/aaZezqSzeEh nlncp6DzSD5gr7UbmLogJhbq+UBr/sFzpgyoRm0cPTKQrSFpYE2S9NNxnNodH9qPAn iDWqb//gfQVPw57Xd42FVO+93/iyQ4g0j3K16XfclCUyiQEnqODakSFETE5XzxvlYp m53D8teNhXp5w== Date: Wed, 05 Oct 2022 13:51:41 -0400 Message-ID: <87lepup39u.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 313366cb11..184e503dd5 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -843,3 +843,65 @@ (define-public coq-elpi Coq's primitives. Finally it provides a way to define new vernacular commands and new tactics.") (license license:lgpl2.1))) + +(define-public coq-mathcomp-hierarchy-builder + (package + (name "coq-mathcomp-hierarchy-builder") + ;; For more information on which version works with Coq 8.16, + ;; see the relevant issue: + ;; https://github.com/math-comp/hierarchy-builder/issues/297 + ;; Here we use + ;; coq-elpi 1.15.4 + ocaml-elpi 1.16.5 + + ;; coq-mathcomp-hierarchy-builder 1.3.0 (Coq 8.16) + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/math-comp/hierarchy-builder") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test-suite" + #:make-flags ,#~(list (string-append "COQBIN=" + #$(this-package-input "coq-core") + "/bin/") + (string-append "COQBININSTALL=" + (assoc-ref %outputs "out") "/bin/") + (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + (string-append "ELPIDIR=" + #$(this-package-input "ocaml-elpi") + "/lib/ocaml/site-lib/elpi") + (string-append "COQMF_COQLIB=" + (assoc-ref %outputs "out") + "/lib/ocaml/site-lib/coq") + (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) + #:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build" make-flags)))))) + (inputs (list coq + coq-core + coq-mathcomp + which + ocaml + coq-elpi + ocaml-elpi)) + (synopsis "Hierarchy structures for the Coq proof assistant") + (description + "Hierarchy Builder (HB) provides high level commands to declare a +hierarchy of interfaces for the Coq system. + +Given a structure one can develop its theory, and that theory becomes +applicable to all examples of the structure. One can also declare alternative +interfaces, for convenience or backward compatibility, and provide glue code +linking these interfaces to the structures part of the hierarchy.") + (home-page "https://math-comp.github.io/") + (license license:expat))) From patchwork Wed Oct 5 17:51:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Garek Dyszel X-Patchwork-Id: 6226 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 5AEFF27BBEA; Wed, 5 Oct 2022 18:59:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 09BE427BBE9 for ; Wed, 5 Oct 2022 18:59:52 +0100 (BST) Received: from localhost ([::1]:47374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1og8gR-0002jX-7C for patchwork@mira.cbaines.net; Wed, 05 Oct 2022 13:59:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1og8Yu-0004Fm-8u for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1og8Yt-0007nC-Vt for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1og8Yt-0007GT-Qo for guix-patches@gnu.org; Wed, 05 Oct 2022 13:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58310] [PATCH 14/14] gnu: Add coq-mathcomp-analysis. References: <87h70iqji2.fsf@disroot.org> In-Reply-To: <87h70iqji2.fsf@disroot.org> Resent-From: Garek Dyszel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Oct 2022 17:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58310@debbugs.gnu.org Received: via spool by 58310-submit@debbugs.gnu.org id=B58310.166499232127894 (code B ref 58310); Wed, 05 Oct 2022 17:52:03 +0000 Received: (at 58310) by debbugs.gnu.org; 5 Oct 2022 17:52:01 +0000 Received: from localhost ([127.0.0.1]:58026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Yr-0007Fq-EF for submit@debbugs.gnu.org; Wed, 05 Oct 2022 13:52:01 -0400 Received: from knopi.disroot.org ([178.21.23.139]:48888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1og8Yq-0007Fh-IU for 58310@debbugs.gnu.org; Wed, 05 Oct 2022 13:52:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E0B514C694 for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:59 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e6HfvFM6CREn for <58310@debbugs.gnu.org>; Wed, 5 Oct 2022 19:51:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664992318; bh=8xsJ424iF5sZIrqdASbx5JxdG2kgX3IAVAdgHjJnbE0=; h=From:To:Subject:Date; b=Ufq1bboBNZSJYEl1EsSgiJYJwYwK8ndXxk0w6rMcK5AkUN81ejqErsjkKt4xptH6s SmaQEMy7uVXCAQULArkCtxTKHrIybHjUH95c+AwDdaWLnpbxb4RnfogGw5OhhxslcR 1vE4hnswnZmEKlfjCdoyxmj0NNUmECNJ4r3w9adG1VN4Khu0z3HsY9oP2iA+dgTkfD 4sf6RNriHNslYvZQ4087M6dEnz43utXQYMWTh7AskelcaRU7anVR6hfv8v1AuwBJ3I 8hVKu5OMlvTeClrOw9Ofj+fAGrnRxUwyMKg+pPMPkbRrcMyTLQD5z1DaljmICZj9Bm 0p20fNeCufqBw== Date: Wed, 05 Oct 2022 13:51:55 -0400 Message-ID: <87ilkyp39g.fsf@disroot.org> 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" Reply-to: Garek Dyszel X-ACL-Warn: , Garek Dyszel via Guix-patches X-Patchwork-Original-From: Garek Dyszel via Guix-patches via From: Garek Dyszel X-getmail-retrieved-from-mailbox: Patches diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 184e503dd5..f7b4c504f9 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -905,3 +905,67 @@ (define-public coq-mathcomp-hierarchy-builder linking these interfaces to the structures part of the hierarchy.") (home-page "https://math-comp.github.io/") (license license:expat))) + +(define-public coq-mathcomp-analysis + (package + (name "coq-mathcomp-analysis") + (version "0.5.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/math-comp/analysis") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l1yaxbmqr4li8x7g51q98a6v383dnf94lw1b74ccpwqz9qybz9m")))) + (build-system gnu-build-system) + (arguments + `( ;No rule to make target 'check'. Stop. + ;; Makefile.common has no references to tests. + ;; There are also no references to tests found after + ;; running the following commands in the top + ;; directory of the cloned repo: + ;; find -type d | grep -i test + ;; rg test # where rg is ripgrep + ;; Checking the git log, we find: "Add test suite for + ;; joins and several fixes". + ;; + ;; If tests are included, this quote suggests that they + ;; would be part of the source files themselves, + ;; and the tests would be run as part of the build + ;; process. + #:tests? #f + #:make-flags ,#~(list (string-append "COQBIN=" + #$(this-package-input "coq-core") + "/bin/") + (string-append "COQBININSTALL=" + (assoc-ref %outputs "out") "/bin/") + (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + (string-append "COQMF_COQLIB=" + (assoc-ref %outputs "out") + "/lib/ocaml/site-lib/coq") + (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) + #:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build" make-flags)))))) + (inputs (list coq + coq-stdlib + coq-mathcomp + coq-mathcomp-finmap + coq-mathcomp-hierarchy-builder + coq-elpi + coq-mathcomp-bigenough + coq-core + which)) + (synopsis "Real analysis for the Coq proof assistant") + (description + "This repository contains an experimental library for real analysis for +the Coq proof-assistant, using the Mathematical Components library.") + (home-page "https://math-comp.github.io/") + (license license:cecill-c)))