summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2020-03-11 15:31:59 -0400
committerLeo Famulari <leo@famulari.name>2020-03-13 19:27:33 -0400
commit39356057bce20f74120b6d227567a943556717cc (patch)
treed5de49883a4122a4ed1b8d12cc3083ccf39b4da1
parent364a1374ad5e04a91cdc29203f0c8073eede72d4 (diff)
downloadpatches-39356057bce20f74120b6d227567a943556717cc.tar
patches-39356057bce20f74120b6d227567a943556717cc.tar.gz
doc: Update guidance about Python 2 package variants.
* doc/contributing.texi (Python Modules): Don't recommend adding Python-2 package variants by default.
-rw-r--r--doc/contributing.texi11
-rw-r--r--doc/guix.texi2
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 8acae26b9a..4658c6f5eb 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@*