From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#40030] [PATCH] doc: Update guidance about Python 2 package variants. Resent-Message-ID: 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40030@debbugs.gnu.org * 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@* -- 2.25.1