From patchwork Wed Mar 11 19:35:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 20640 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 D725327BBE4; Wed, 11 Mar 2020 19:37:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1AAE627BBEA for ; Wed, 11 Mar 2020 19:37:10 +0000 (GMT) Received: from localhost ([::1]:57510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC7AD-0006MO-Hc for patchwork@mira.cbaines.net; Wed, 11 Mar 2020 15:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33403) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC7A7-0006Hp-SN for guix-patches@gnu.org; Wed, 11 Mar 2020 15:37:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC7A6-0002iC-NR for guix-patches@gnu.org; Wed, 11 Mar 2020 15:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49589) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC7A6-0002i6-KV for guix-patches@gnu.org; Wed, 11 Mar 2020 15:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jC7A6-0008BR-J1 for guix-patches@gnu.org; Wed, 11 Mar 2020 15:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40030] [PATCH] doc: Update guidance about Python 2 package variants. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Mar 2020 19:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40030@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158395537931398 (code B ref -1); Wed, 11 Mar 2020 19:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Mar 2020 19:36:19 +0000 Received: from localhost ([127.0.0.1]:55562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jC79P-0008AL-7W for submit@debbugs.gnu.org; Wed, 11 Mar 2020 15:36:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:40991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jC79N-0008AE-8e for submit@debbugs.gnu.org; Wed, 11 Mar 2020 15:36:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33297) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC79L-0005nZ-W4 for guix-patches@gnu.org; Wed, 11 Mar 2020 15:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC79K-0001Tp-R8 for guix-patches@gnu.org; Wed, 11 Mar 2020 15:36:15 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:51035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jC79K-0001Sz-Lf for guix-patches@gnu.org; Wed, 11 Mar 2020 15:36:14 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 31CEE21B01; Wed, 11 Mar 2020 15:36:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 11 Mar 2020 15:36:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=Dhd0zL68yKjQyqMdZsKt5Ns OJrulUoFFA1P0Gp7gIvc=; b=CDTdKDKIa3nliGfd14iE9udAk0x71924+nWHBG8 9KdIU2iTFXOEw2ASC/uRasBTuwzmwWBtEkseUyOZLebckOUoHt1CFRFrckWAthNL okLC1iH7+RBhx9rTa16bJDSXdiCJJQ21UzWTOnKWlBJt1VEUbmNCuWxryFgXEqfW OFYY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Dhd0zL 68yKjQyqMdZsKt5NsOJrulUoFFA1P0Gp7gIvc=; b=bYKZdMJAXzXAUcc92eH8qo FvSZsLkTsbnyBn0Xw/HSipz4W29/dsuJ/llYbuYO2bTEkEWciPDRJ2XMjFkWzX3w sLNXRuDKzdcqCac6AuHZGcuqCmiUrmBZcnbttrQrzoduVNC/TBa49SvKaw4MRR0i 8R9vAsBcBnz8YZCoAMkcSkLn9dx2xbCS9gnIBZMwleNzQP+xnsGPsYewtB4xy12F pdcd7S5aaoZ4jP3gpuR/7mO3x9UxIuplZfcslX1rsaz/4aHNVuB5QnWOb/guO2b+ PDWI8ZuRlp8bpcGT3NoGfvESXynrSlsWHRddi9Abtmfn83FHxth/Ft295sxdINTw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddvfedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdr nhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 98CBE3280068 for ; Wed, 11 Mar 2020 15:36:13 -0400 (EDT) From: Leo Famulari Date: Wed, 11 Mar 2020 15:35:56 -0400 Message-Id: <3fd7f685b5a188770750e85a973d265a57967954.1583955355.git.leo@famulari.name> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * doc/contributing.texi (Python Modules): Don't recommend adding Python-2 package variants by default. --- doc/contributing.texi | 11 ++++++----- doc/guix.texi | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index afcc030b4f..31b875f817 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -612,11 +612,12 @@ To avoid confusion and naming clashes with other programming languages, it seems desirable that the name of a package for a Python module contains the word @code{python}. -Some modules are compatible with only one version of Python, others with both. -If the package Foo compiles only with Python 3, we name it -@code{python-foo}; if it compiles only with Python 2, we name it -@code{python2-foo}. If it is compatible with both versions, we create two -packages with the corresponding names. +Some modules are compatible with only one version of Python, others with +both. If the package Foo is compiled with Python 3, we name it +@code{python-foo}. If it is compiled with Python 2, we name it +@code{python2-foo}. Packages should be added when they are necessary; +we don't add Python 2 variants of the package unless we are going to use +them. If a project already contains the word @code{python}, we drop this; for instance, the module python-dateutil is packaged under the names diff --git a/doc/guix.texi b/doc/guix.texi index eb6eb99361..1f349144d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28,7 +28,7 @@ Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* -Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* +Copyright @copyright{} 2015, 2016, 2017, 2019, 2020 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*