From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 8JOVHUAUQWYBFQAAe85BDQ:P1 (envelope-from ) for ; Sun, 12 May 2024 21:10:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8JOVHUAUQWYBFQAAe85BDQ (envelope-from ) for ; Sun, 12 May 2024 21:10:56 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=NoNfqgP+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715541056; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ks9ZRsnfU5xunSf64BxfTV6Q52+mtZISBNIm0GGloHk=; b=bW9WNP1pk+qjlyL+t60CXtF7G4I0E+dniOogtDZcPddTY09eI4/ySbqJ8STa4MlbBodRK/ xGXc1dv91Oxzewi/2YiA/TEDWW4d59UULbzj+sYXuESXZqI5skOTzlyodnMFIWTavnMhIA ZpdcOl/5ZhA/BKcAfqxelXRabPSlNDtUgn1Rkczko5XHaztJOVPJJlpePS9oG29B4WO6Uk y7eDH27eK83MXk5nXiCj/hNU4+fqM61JXQw2dJySZlITSbPe8w9DlXNzUR1JJAhd/psA5M dbDykE+Odx+r2Nwvt7SssBvqP7j/Xd1anJmsZPajJ7jW3p7gFkKpjLHL5gNKOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=NoNfqgP+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715541056; a=rsa-sha256; cv=none; b=GextWuIJSKhCS6HU12kimTglcT5T/Ns4nx9ocpcAITc5Fod8pwVWs9QToIqxV6P3ntfhfF NgVxQ8fwdd94gfy7jCzBVQP8Hl6F5KF8xSvZyK+MhzL7fY0Gbesoznx9bNRAI10S1tCBCw NNLAvwYeCsHyWFjWfEbMfngeGFwSzeLi/TilpMhEJx3fajkMsjHHKGi0HFkM9igZAGN2Wb 4C0ri/hwjuUhDw//nfoHISJsSM3KTVUoQyp3QWnd3Krh/EHymi+wv+L7VfeSV5sDU3OmMK OmckMq6bBNuxwbst41rgFXBtbal4+FpjVl46LY2WfLaj2SAnUeRiPC6dgyNXQg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 19448641BB for ; Sun, 12 May 2024 21:10:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6EaO-0002H4-OZ; Sun, 12 May 2024 15:10:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6EaF-0002FX-Qq for guix-patches@gnu.org; Sun, 12 May 2024 15:10:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6EaF-00083o-Hw; Sun, 12 May 2024 15:10:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6EaB-0008Bc-Js; Sun, 12 May 2024 15:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70715] [PATCH v2 3/3] guix: End package descriptions with period. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, efraim@flashner.co.il, lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 19:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70715@debbugs.gnu.org Cc: Christopher Baines , Efraim Flashner , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Christopher Baines , Efraim Flashner , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 70715-submit@debbugs.gnu.org id=B70715.171554094931396 (code B ref 70715); Sun, 12 May 2024 19:10:03 +0000 Received: (at 70715) by debbugs.gnu.org; 12 May 2024 19:09:09 +0000 Received: from localhost ([127.0.0.1]:56019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6EZI-0008AF-Bs for submit@debbugs.gnu.org; Sun, 12 May 2024 15:09:09 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59293 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6EZE-00089L-WC for 70715@debbugs.gnu.org; Sun, 12 May 2024 15:09:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715540926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ks9ZRsnfU5xunSf64BxfTV6Q52+mtZISBNIm0GGloHk=; b=NoNfqgP+eS2dYDG+ov+vSxXk31RrHNBni91MP/3wzC88CNDWQivUCYBE5gNNokCTL76Amc MktgaquN79cYEQzY921o6s/jRpPtlxk3M4bqYWVITLAIgLc3D/u50AbEp71FnmHcdyvwKr 9t9z1YQsw0gD/WI982CmdL7DMtUU6IDZsX3m8vd7I6RO7ncUL45Y03AHXAh4kzAKe4yB+3 Jo8RDjYu/twxn26PQzo3VtDoFymoEkfnqJcggFsBPB/GEMc0CNQxZFIw3l95+svkqPzMJV Lr29yFdFa4j4TBLT0tYwsG+fDM2SgRixCtxmnEYafGhVbv9WvFJ07IzbGlDBRg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7b9f143b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70715@debbugs.gnu.org>; Sun, 12 May 2024 19:08:46 +0000 (UTC) Date: Sun, 12 May 2024 21:08:32 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.37 X-Spam-Score: -6.37 X-Migadu-Queue-Id: 19448641BB X-Migadu-Scanner: mx13.migadu.com X-TUID: 0gmtUFDpxytT * guix/import/utils.scm (beautify-description): Append period to last words which do not end with one. * tests/crate.scm: Append period to descriptions. * tests/elm.scm: Append period to descriptions. * tests/gem.scm: Append period to descriptions. * tests/hexpm.scm: Append period to descriptions. * tests/minetest.scm: Append period to descriptions. * tests/pypi.scm: Append period to descriptions. Change-Id: I0b12c4d94cb26cf62fab5b7cbf7885e66ff6c10f --- guix/import/utils.scm | 9 +++++++++ tests/crate.scm | 36 ++++++++++++++++++------------------ tests/elm.scm | 2 +- tests/gem.scm | 12 ++++++------ tests/hexpm.scm | 8 ++++---- tests/minetest.scm | 2 +- tests/pypi.scm | 8 ++++---- 7 files changed, 43 insertions(+), 34 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 09a01cf315..45fed93134 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -370,6 +370,15 @@ (define* (beautify-description description #:optional (length 80)) (cons* "This" "package" (string-downcase first) rest)) (_ words))) + (new-words + (match new-words + ((rest ... last) + (reverse (cons (if (or (string-suffix? "." last) + (string-suffix? "!" last) + (string-suffix? "?" last)) + last + (string-append last ".")) + (reverse rest)))))) (cleaned (string-join (map fix-word new-words)))) ;; Use double spacing between sentences diff --git a/tests/crate.scm b/tests/crate.scm index 8b5bbc1b03..5b4ad08c3c 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -503,7 +503,7 @@ (define have-guile-semver? (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (string=? test-source-hash hash)) @@ -592,7 +592,7 @@ (define have-guile-semver? ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-alice-0.7 (package @@ -611,7 +611,7 @@ (define have-guile-semver? (arguments ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -630,7 +630,7 @@ (define have-guile-semver? (arguments ('quasiquote (#:skip-build? #t))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-b-1 (package @@ -653,7 +653,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-a-1 (package @@ -680,7 +680,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-root-1 (package @@ -711,7 +711,7 @@ (define have-guile-semver? ('unquote rust-intermediate-c-1)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0))))) #t) (x @@ -740,7 +740,7 @@ (define have-guile-semver? ('unquote rust-leaf-alice-0.7)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-alice-0.7 (package @@ -758,7 +758,7 @@ (define have-guile-semver? (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -776,7 +776,7 @@ (define have-guile-semver? (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-b-1 (package @@ -798,7 +798,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-intermediate-a-1 (package @@ -824,7 +824,7 @@ (define have-guile-semver? ('unquote rust-leaf-bob-3)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-root-1 (package @@ -855,7 +855,7 @@ (define have-guile-semver? ('unquote rust-intermediate-c-1)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0))))) #t) (x @@ -972,7 +972,7 @@ (define rust-leaf-bob-3.0.2-yanked ('unquote 'rust-leaf-bob-4.0.0-yanked)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0))))) #t) (x @@ -1038,7 +1038,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3.0.2-yanked (package @@ -1058,7 +1058,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-leaf-bob-3 (package @@ -1076,7 +1076,7 @@ (define rust-leaf-bob-3.0.2-yanked (build-system cargo-build-system) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0)))) (define-public 'rust-bar-1 (package @@ -1103,7 +1103,7 @@ (define rust-leaf-bob-3.0.2-yanked ('unquote 'rust-leaf-bob-4.0.0-yanked)))))) (home-page "http://example.com") (synopsis "summary") - (description "This package provides summary") + (description "This package provides summary.") (license (list license:expat license:asl2.0))))) #t) (x diff --git a/tests/elm.scm b/tests/elm.scm index c30623da03..48d3eb4b01 100644 --- a/tests/elm.scm +++ b/tests/elm.scm @@ -257,7 +257,7 @@ (define (directory-sha256 directory) "https://package.elm-lang.org/packages/elm-guix/demo/3.0.0") (synopsis "A test for `(guix import elm)`") (description - "This package provides a test for `(guix import elm)`") + "This package provides a test for `(guix import elm)`.") (properties '((upstream-name . "elm-guix/demo"))) (license license:gpl3+))) (equal? (directory-sha256 elm-guix-demo-dir) diff --git a/tests/gem.scm b/tests/gem.scm index 7e2436e3fb..dae29437e5 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -117,7 +117,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler ruby-bar)) (synopsis "A cool gem") - (description "This package provides a cool gem") + (description "This package provides a cool gem.") (home-page "https://example.com") (license (list license:expat license:asl2.0))) #t) @@ -146,7 +146,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler ruby-bar)) (synopsis "A cool gem") - (description "This package provides a cool gem") + (description "This package provides a cool gem.") (home-page "https://example.com") (license (list license:expat license:asl2.0))) #t) @@ -182,7 +182,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler)) (synopsis "Another cool gem") - (description "Another cool gem") + (description "Another cool gem.") (home-page "https://example.com") (license #f)) ;no licensing info (package @@ -198,7 +198,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler ruby-bar)) (synopsis "A cool gem") - (description "This package provides a cool gem") + (description "This package provides a cool gem.") (home-page "https://example.com") (license (list license:expat license:asl2.0)))) #t) @@ -234,7 +234,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler)) (synopsis "Another cool gem") - (description "Another cool gem") + (description "Another cool gem.") (home-page "https://example.com") (license #f)) ;no licensing info (package @@ -250,7 +250,7 @@ (define test-bundler-json (build-system ruby-build-system) (propagated-inputs (list bundler ruby-bar)) (synopsis "A cool gem") - (description "This package provides a cool gem") + (description "This package provides a cool gem.") (home-page "https://example.com") (license (list license:expat license:asl2.0)))) #t) diff --git a/tests/hexpm.scm b/tests/hexpm.scm index 5df9af0ca6..1e746f9b34 100644 --- a/tests/hexpm.scm +++ b/tests/hexpm.scm @@ -152,7 +152,7 @@ (define test-fasel-release (build-system rebar-build-system) (inputs (list erlang-blubb erlang-fasel)) (synopsis "A cool package") - (description "This package provides a cool package") + (description "This package provides a cool package.") (home-page "https://hex.pm/packages/bla") (license (list license:expat license:asl2.0))) #t) @@ -212,7 +212,7 @@ (define test-fasel-release (build-system mix-build-system) (inputs (list erlang-fasel)) (synopsis "Another cool package") - (description "Another cool package") + (description "Another cool package.") (home-page "https://hex.pm/packages/blubb") (license license:expat)) (package @@ -227,7 +227,7 @@ (define test-fasel-release "1k6d70mxwqgq78jrbr7yqnw187yki74jnagybi7nacrj4a67qjha")))) (build-system gnu-build-system) (synopsis "Yet another cool package") - (description "Yet another cool package") + (description "Yet another cool package.") (home-page "https://hex.pm/packages/fasel") (license "GPL")) (package @@ -243,7 +243,7 @@ (define test-fasel-release (build-system rebar-build-system) (inputs (list erlang-blubb erlang-fasel)) (synopsis "A cool package") - (description "This package provides a cool package") + (description "This package provides a cool package.") (home-page "https://hex.pm/packages/bla") (license (list license:expat license:asl2.0)))) #t) diff --git a/tests/minetest.scm b/tests/minetest.scm index 78469bf95b..bf1313ee22 100644 --- a/tests/minetest.scm +++ b/tests/minetest.scm @@ -48,7 +48,7 @@ (define* (make-package-sexp #:key (home-page "https://example.org/foo") (repo "https://example.org/foo.git") (synopsis "synopsis") - (guix-description "description") + (guix-description "description.") (guix-license '(list license:cc-by-sa4.0 license:lgpl3+)) (inputs '()) diff --git a/tests/pypi.scm b/tests/pypi.scm index 42b39cde73..c9aee34d8b 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -315,7 +315,7 @@ (define-syntax-rule (with-pypi responses body ...) (native-inputs (list python-pytest)) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "summary.") (license license:lgpl2.0)) (and (string=? default-sha256/base32 hash) (equal? (pypi->guix-package "foo" #:version "1.0.0") @@ -356,7 +356,7 @@ (define-syntax-rule (with-pypi responses body ...) (native-inputs (list python-pytest)) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "summary.") (license license:lgpl2.0)) (string=? default-sha256/base32 hash)) (x @@ -384,7 +384,7 @@ (define-syntax-rule (with-pypi responses body ...) (build-system pyproject-build-system) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "summary.") (license license:lgpl2.0)) (string=? default-sha256/base32 hash)) (x @@ -414,7 +414,7 @@ (define-syntax-rule (with-pypi responses body ...) (native-inputs (list python-pytest)) (home-page "http://example.com") (synopsis "summary") - (description "summary") + (description "summary.") (license license:lgpl2.0)) (string=? default-sha256/base32 hash)) (x -- 2.41.0