[PATCH 00/18] Remove Python 2 packages possibly added for Python 2 MediaGoblin.

OpenSubmitted by Ben Sturmfels.
Details
2 participants
  • Ben Sturmfels
  • zimoun
Owner
unassigned
Severity
normal
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:07
(address . guix-patches@gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030711.2715-1-ben@sturm.com.au
The following packages were once dependencies of Python 2 MediaGoblin, but are
no longer used by MediaGoblin or any other Guix package. There may well be
people using these for non-Guix work, so I'll defer to maintainers as to
whether it's reasonable to remove them - I'm just trying to clean up after
MediaGoblin.

python2-openid-teams and python2-openid-cla weren't used by MediaGoblin
directly, but seem closely related to the removed python2-openid package and
are similarly not used by other Guix packages.

python2-psycopg2 is not removed here because although it's likely still a
popular Guix package, so should perhaps be one of the last Python 2 packages
to go.

Ben Sturmfels (18):
gnu: Remove python2-exif-read.
gnu: Remove python2-pyld.
gnu: Remove python2-jsonschema.
gnu: Remove python2-unidecode.
gnu: Remove python2-itsdangerous.
gnu: Remove python2-feedgenerator.
gnu: Remove python2-markdown.
gnu: Remove python2-configobj.
gnu: Remove python2-waitress.
gnu: Remove python2-email-validator.
gnu: Remove python2-py-bcrypt.
gnu: Remove python2-oauthlib.
gnu: Remove python2-wtforms.
gnu: Remove python2-pastescript.
gnu: Remove python2-openid-teams.
gnu: Remove python2-openid-cla.
gnu: Remove python2-openid.
gnu: Remove python2-celery.

gnu/packages/python-crypto.scm | 3 --
gnu/packages/python-web.scm | 39 ----------------------
gnu/packages/python-xyz.scm | 60 ++--------------------------------
3 files changed, 2 insertions(+), 100 deletions(-)

--
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 01/18] gnu: Remove python2-exif-read.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-1-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-exif-read): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fa16687e24..9b47f8f8c1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3165,9 +3165,6 @@ structure is left untouched.")
 files.")
     (license license:bsd-3)))
 
-(define-public python2-exif-read
-  (package-with-python2 python-exif-read))
-
 (define-public python-pyld
   (package
     (name "python-pyld")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 02/18] gnu: Remove python2-pyld.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-2-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-pyld): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9b47f8f8c1..54e37df21f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3182,9 +3182,6 @@ files.")
      "PyLD is an implementation of the JSON-LD specification.")
     (license license:bsd-3)))
 
-(define-public python2-pyld
-  (package-with-python2 python-pyld))
-
 (define-public python-cli-helpers
   (package
     (name "python-cli-helpers")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 03/18] gnu: Remove python2-jsonschema.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-3-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-jsonschema): Remove variable.
---
gnu/packages/python-xyz.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 54e37df21f..291a5c50fc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3368,16 +3368,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
     (synopsis "Implementation of JSON Schema for Python")
     (description
      "Jsonschema is an implementation of JSON Schema for Python.")
-    (license license:expat)
-    (properties `((python2-variant . ,(delay python2-jsonschema))))))
-
-(define-public python2-jsonschema
-  (let ((jsonschema (package-with-python2
-                     (strip-python2-variant python-jsonschema))))
-    (package/inherit jsonschema
-             (propagated-inputs
-              `(("python2-functools32" ,python2-functools32)
-                ,@(package-propagated-inputs jsonschema))))))
+    (license license:expat)))
 
 (define-public python-schema
   (package
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 04/18] gnu: Remove python2-unidecode.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-4-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-unidecode): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 291a5c50fc..1fa76c1e49 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3478,9 +3478,6 @@ machine identifiers from human-readable Unicode strings that should still be
 somewhat intelligible.")
     (license license:gpl2+)))
 
-(define-public python2-unidecode
-  (package-with-python2 python-unidecode))
-
 (define-public python-text-unidecode
   (package
     (name "python-text-unidecode")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 10/18] gnu: Remove python2-email-validator.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-10-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-email-validator): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8f07db377b..f6fe106bcf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15096,9 +15096,6 @@ simple, lightweight implementation.")
      "This library validates email address syntax and deliverability.")
     (license license:cc0)))
 
-(define-public python2-email-validator
-  (package-with-python2 python-email-validator))
-
 (define-public python-ukpostcodeparser
   (package
     (name "python-ukpostcodeparser")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 11/18] gnu: Remove python2-py-bcrypt.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-11-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-crypto.scm (python2-py-bcrypt): Remove variable.
---
gnu/packages/python-crypto.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index d9102adcc9..a969a2bb2d 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -204,9 +204,6 @@ John the Ripper).")
     ;; the rest is under ISC.
     (license (list license:isc license:bsd-3 license:bsd-4))))
 
-(define-public python2-py-bcrypt
-  (package-with-python2 python-py-bcrypt))
-
 (define-public python-pyblake2
   (package
     (name "python-pyblake2")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 13/18] gnu: Remove python2-wtforms.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-13-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-wtforms): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8f80e64a9d..d37fbcc181 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4170,9 +4170,6 @@ for Python web development.  It is very similar to the web form API
 available in Django, but is a standalone package.")
     (license license:bsd-3)))
 
-(define-public python2-wtforms
-  (package-with-python2 python-wtforms))
-
 (define-public python-paste
   (package
     (name "python-paste")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 05/18] gnu: Remove python2-itsdangerous.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-5-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-itsdangerous): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1fa76c1e49..44d0d07ceb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3642,9 +3642,6 @@ visualisation and class tracker statistics.")
 environments and back.")
     (license license:bsd-3)))
 
-(define-public python2-itsdangerous
-  (package-with-python2 python-itsdangerous))
-
 (define-public python-pyyaml
   (package
     (name "python-pyyaml")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 06/18] gnu: Remove python2-feedgenerator.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-6-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-feedgenerator): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 44d0d07ceb..f32d0f1e15 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4567,9 +4567,6 @@ public key files.")
 which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
     (license license:bsd-3)))
 
-(define-public python2-feedgenerator
-  (package-with-python2 python-feedgenerator))
-
 (define-public python-jsonrpc-server
   (package
     (name "python-jsonrpc-server")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 14/18] gnu: Remove python2-pastescript.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-14-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-pastescript): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d37fbcc181..a4798d249f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4240,9 +4240,6 @@ variety of features, from launching web applications to bootstrapping project
 layouts.")
     (license license:expat)))
 
-(define-public python2-pastescript
-  (package-with-python2 python-pastescript))
-
 (define-public python2-urlgrabber
   (package
     (name "python2-urlgrabber")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 16/18] gnu: Remove python2-openid-cla.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-16-ben@sturm.com.au
Remove Python 2 leaf package.

* gnu/packages/python-web.scm (python2-openid-cla): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index df00f14947..f3589dc06c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1516,9 +1516,6 @@ Databricks REST APIs.")
 contributor license agreement extension for python-openid.")
     (license license:bsd-3)))
 
-(define-public python2-openid-cla
-  (package-with-python2 python-openid-cla))
-
 (define-public python-openid-teams
   (package
     (name "python-openid-teams")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 08/18] gnu: Remove python2-configobj.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-8-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-configobj): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8a3a1e7bee..df3d49e43f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11652,9 +11652,6 @@ config files.")
     (home-page "https://github.com/DiffSK/configobj")
     (license license:bsd-3)))
 
-(define-public python2-configobj
-  (package-with-python2 python-configobj))
-
 (define-public python-configargparse
   (package
     (name "python-configargparse")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:09
[PATCH 17/18] gnu: Remove python2-openid.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-17-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-openid): Remove variable.
---
gnu/packages/python-web.scm | 24 ------------------------
1 file changed, 24 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f3589dc06c..214bc90127 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1331,7 +1331,6 @@ is Python’s.")
           (lambda _
             (invoke "coverage" "run" "-m"
                     "unittest" "openid.test.test_suite"))))))
-    (properties `((python2-variant . ,(delay python2-openid))))
     (propagated-inputs
      `(("python-defusedxml" ,python-defusedxml)))
     (native-inputs
@@ -1344,29 +1343,6 @@ is Python’s.")
 for clients and servers.")
     (license license:asl2.0)))
 
-(define-public python2-openid
-  (package
-    (name "python2-openid")
-    (version "2.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-openid" version))
-       (sha256
-        (base32
-         "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"))))
-    (build-system python-build-system)
-    (arguments
-     ;; Python 3 support is in `python3-openid`, a separate package.
-     `(#:python ,python-2
-       ;; Tests aren't initialized correctly.
-       #:tests? #f))
-    (home-page "https://github.com/openid/python-openid")
-    (synopsis "OpenID support for servers and consumers")
-    (description "This library provides OpenID authentication for Python, both
-for clients and servers.")
-    (license license:asl2.0)))
-
 (define-public python-cssutils
   (package
     (name "python-cssutils")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:09
[PATCH 18/18] gnu: Remove python2-celery.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-18-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
---
gnu/packages/python-xyz.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f6fe106bcf..316d8c9b64 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13194,16 +13194,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 12/18] gnu: Remove python2-oauthlib.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-12-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-oauthlib): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b75cb5ddfd..8f80e64a9d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2739,9 +2739,6 @@ adapter for use with the Requests library.")
 OAuth request-signing logic.")
     (license license:bsd-3)))
 
-(define-public python2-oauthlib
-  (package-with-python2 python-oauthlib))
-
 (define-public python-rauth
   (package
     (name "python-rauth")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 07/18] gnu: Remove python2-markdown.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-7-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-markdown): Remove variable.
---
gnu/packages/python-xyz.scm | 14 --------------
1 file changed, 14 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f32d0f1e15..8a3a1e7bee 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9633,22 +9633,8 @@ Python.")
 Markdown.  The library features international input, various Markdown
 extensions, and several HTML output formats.  A command line wrapper
 markdown_py is also provided to convert Markdown files to HTML.")
-    (properties `((python2-variant . ,(delay python2-markdown))))
     (license license:bsd-3)))
 
-;; Markdown 3.2 dropped support for Python 2.
-(define-public python2-markdown
-  (let ((base (package-with-python2 (strip-python2-variant python-markdown))))
-    (package
-      (inherit base)
-     (version "3.1.1")
-     (source (origin
-               (method url-fetch)
-               (uri (pypi-uri "Markdown" version))
-               (sha256
-                (base32
-                 "0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f")))))))
-
 (define-public python-ptyprocess
   (package
     (name "python-ptyprocess")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 15/18] gnu: Remove python2-openid-teams.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-15-ben@sturm.com.au
Remove Python 2 leaf package.

* gnu/packages/python-web.scm (python2-openid-teams): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a4798d249f..df00f14947 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1539,9 +1539,6 @@ contributor license agreement extension for python-openid.")
 teams extension for python-openid.")
     (license license:bsd-3)))
 
-(define-public python2-openid-teams
-  (package-with-python2 python-openid-teams))
-
 (define-public python-priority
   (package
     (name "python-priority")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 11 Aug 2021 05:08
[PATCH 09/18] gnu: Remove python2-waitress.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210811030901.2865-9-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-waitress): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index df3d49e43f..8f07db377b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12889,9 +12889,6 @@ templates into Python modules.")
 server with very acceptable performance.")
     (license license:zpl2.1)))
 
-(define-public python2-waitress
-  (package-with-python2 python-waitress))
-
 (define-public python-whichcraft
   (package
     (name "python-whichcraft")
-- 
2.32.0
B
B
Ben Sturmfels wrote on 31 Aug 2021 02:09
(address . 49993@debbugs.gnu.org)
20210831000946.11489-1-ben@sturm.com.au
This is an additional dependency that has since been removed from
MediaGoblin, which is why I didn't catch in the initial patch set.
B
B
Ben Sturmfels wrote on 31 Aug 2021 02:09
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210831000946.11489-2-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-translitcodec): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 316d8c9b64..16fe38b31d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13220,9 +13220,6 @@ best-effort representations using smaller coded character sets (ASCII,
 ISO 8859, etc.).")
     (license license:expat)))
 
-(define-public python2-translitcodec
-  (package-with-python2 python-translitcodec))
-
 (define-public python-anyqt
   (package
     (name "python-anyqt")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 31 Aug 2021 03:08
Re: bug#49993: [PATCH 00/18] Remove Python 2 packages possibly added for Python 2 MediaGoblin.
(address . 49993@debbugs.gnu.org)
871r6a2zg7.fsf_-_@sturm.com.au
Upon investigation, the following were added by cwebber or dthompson, so likely related to MediaGoblin:

python2-exif-read
python2-pyld
python2-jsonschema
python2-unidecode
python2-itsdangerous
python2-feedgenerator
python2-waitress
python2-oauthlib
python2-wtforms
python2-pastescript
python2-celery

The following were added by others, so probably had uses other than MediaGoblin:

python2-markdown
python2-configobj
python2-email-validator
python2-py-bcrypt
python2-openid-teams
python2-openid-cla
python2-openid
python2-celery

Of all the above only python2-jsonschema is failing to build.

Now that I think about it, I'm not sure that this ad-hoc approach to
removing Python 2 deps is all that useful. Maybe a systemic approach is
needed eg. drop all broken Python 2 packages and announce a future date
to drop all non-broken Python 2 packages.

Regards,
Ben
Z
Z
zimoun wrote on 31 Aug 2021 08:10
Re: [bug#49993] [PATCH 00/18] Remove Python 2 packages possibly added for Python 2 MediaGoblin.
86wno2dtzm.fsf@gmail.com
Hi,

On Tue, 31 Aug 2021 at 11:08, Ben Sturmfels via Guix-patches via <guix-patches@gnu.org> wrote:

Toggle quote (5 lines)
> Now that I think about it, I'm not sure that this ad-hoc approach to
> removing Python 2 deps is all that useful. Maybe a systemic approach is
> needed eg. drop all broken Python 2 packages and announce a future date
> to drop all non-broken Python 2 packages.

This is more or less the plan. Although there is no fixed future date
to drop all the non-broken Python 2 packages. :-)

For instance #49272 remove 10 Python 2 packages and to find them:

Toggle snippet (5 lines)
guix weather --display-missing \
--substitute-urls="https://ci.guix.gnu.org" \
| grep 'python2-'

then I pick only the leaf packages using “guix refresh -l”. The
dependency graph needs some care because sometimes the graph is
rewritten. For example,

$ guix refresh -l python2-plastid
No dependents other than itself: python2-plastid@0.4.8

Then, let try to locally build it in case something wrong happened on
the CI. Note that the missing is checked on Berlin but the build uses
both (Berlin and Bordeaux):

$ guix build python2-plastid --no-grafts

Or in some cases, it is a leaf package broken because another ’python2-’
package is broken. Here, ’python2-pandas’. In this case, it
depends. ;-) Try to fix ’python2-pandas’ because:

$ guix refresh -l python2-pandas
Building the following 7 packages would ensure 12 dependent packages are rebuilt: fio@3.27 python2-pybedtools@0.8.2 python2-plastid@0.4.8 python2-biom-format@2.1.7 python2-warpedlmm@0.21 poretools@0.6.0-1.e426b1f ribodiff@0.2.2

or simply remove all the dependants in the same patch set. Be careful,
the removal needs the correct order. :-)

Personally, I tend to remove leaf package brokens becaus they do not
build themselves and not because of broken dependencies. For instance,
in this list (from Guix a9eb969):

Toggle snippet (13 lines)
python2-biom-format-2.1.7
python2-pybedtools-0.8.2
python2-plastid-0.4.8
python2-warpedlmm-0.21
python2-scikit-learn-0.20.4
python2-fastlmm-0.2.21
python2-pandas-0.24.2
python2-seaborn-0.9.1
python2-pysnptools-0.4.11
ptpython2-3.0.17
python2-statsmodels-0.11.1

I would remove only the package ’ptpython2’. All the others depend on
’python2-pandas’ and remove ’python2-pandas’ means also remove ’fio’,
’poretools’ or ’ribodiff’. And I am not enough qualified to have an
opinion if it is worth to fix them. Therefore, I queue these packages
in my TODO list and then I revisit months later: if there are still
broken and no issue is open, it means they do not worth and can be
removed.

HTH.

All the best,
simon
B
B
Ben Sturmfels wrote on 1 Sep 2021 17:43
Re: bug#49993: [PATCH 00/18] Remove Python 2 packages possibly added for Python 2 MediaGoblin.
(name . zimoun)(address . zimon.toutoune@gmail.com)(address . 49993@debbugs.gnu.org)
87h7f4l2sg.fsf_-_@sturm.com.au
On Tue, 31 Aug 2021, zimoun wrote:

Toggle quote (7 lines)
> then I pick only the leaf packages using “guix refresh -l”. The
> dependency graph needs some care because sometimes the graph is
> rewritten. For example,
>
> $ guix refresh -l python2-plastid
> No dependents other than itself: python2-plastid@0.4.8

Whoops! Thanks Simon, I had been mistakenly just grepping the sources to
find dependencies, so my earlier claims of packages being unused were
wrong.

Only the following have no dependencies (according to `guix refresh
-l`):

python2-exif-read
python2-pyld
python2-itsdangerous
python2-feedgenerator
python2-wtforms
python2-pastescript
python2-celery
python2-configobj
python2-email-validator
python2-openid-teams
python2-openid-cla
python2-openid
python2-celery
python2-translitcodec

These DO have dependencies, so should NOT be removed:

python2-markdown
python2-py-bcrypt
python2-waitress
python2-oauthlib

Regards,
Ben
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 01/12] gnu: Remove python2-pyld.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-2-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-pyld): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9b47f8f8c1..54e37df21f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3182,9 +3182,6 @@ files.")
      "PyLD is an implementation of the JSON-LD specification.")
     (license license:bsd-3)))
 
-(define-public python2-pyld
-  (package-with-python2 python-pyld))
-
 (define-public python-cli-helpers
   (package
     (name "python-cli-helpers")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 00/12] Remove Python 2 packages
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-1-ben@sturm.com.au
The following patchset removes these Python 2 leaf package and replaces all
previous patches. Of this list, the following were added by cwebber or
dthompson, so highly likely for MediaGoblin:

python2-pyld
python2-itsdangerous
python2-feedgenerator
python2-wtforms
python2-pastescript
python2-translitcodec

These were added by other people:

python2-configobj
python2-email-validator
python2-openid-teams
python2-openid-cla
python2-openid
python2-celery

This time I've *properly* confirmed that these are indeed leaf packages:

$ guix refresh -l python2-pyld
No dependents other than itself: python2-pyld@1.0.5
$ guix refresh -l python2-itsdangerous
No dependents other than itself: python2-itsdangerous@1.1.0
$ guix refresh -l python2-feedgenerator
No dependents other than itself: python2-feedgenerator@1.9
$ guix refresh -l python2-configobj
No dependents other than itself: python2-configobj@5.0.6
$ guix refresh -l python2-email-validator
No dependents other than itself: python2-email-validator@1.0.2
$ guix refresh -l python2-wtforms
No dependents other than itself: python2-wtforms@2.1
$ guix refresh -l python2-pastescript
No dependents other than itself: python2-pastescript@2.0.2
$ guix refresh -l python2-openid-teams
No dependents other than itself: python2-openid-teams@1.1
$ guix refresh -l python2-openid-cla
No dependents other than itself: python2-openid-cla@1.2
$ guix refresh -l python2-openid
No dependents other than itself: python2-openid@2.2.5
$ guix refresh -l python2-celery
No dependents other than itself: python2-celery@4.2.1


Ben Sturmfels (12):
gnu: Remove python2-pyld.
gnu: Remove python2-itsdangerous.
gnu: Remove python2-feedgenerator.
gnu: Remove python2-configobj.
gnu: Remove python2-email-validator.
gnu: Remove python2-wtforms.
gnu: Remove python2-pastescript.
gnu: Remove python2-openid-teams.
gnu: Remove python2-openid-cla.
gnu: Remove python2-openid.
gnu: Remove python2-celery.
gnu: Remove python2-translitcodec.

gnu/packages/python-web.scm | 36 ------------------------------------
gnu/packages/python-xyz.scm | 29 +----------------------------
2 files changed, 1 insertion(+), 64 deletions(-)

--
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 02/12] gnu: Remove python2-itsdangerous.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-3-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-itsdangerous): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 54e37df21f..c7ef35bbd1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3654,9 +3654,6 @@ visualisation and class tracker statistics.")
 environments and back.")
     (license license:bsd-3)))
 
-(define-public python2-itsdangerous
-  (package-with-python2 python-itsdangerous))
-
 (define-public python-pyyaml
   (package
     (name "python-pyyaml")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 03/12] gnu: Remove python2-feedgenerator.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-4-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-feedgenerator): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c7ef35bbd1..bfadc92166 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4579,9 +4579,6 @@ public key files.")
 which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
     (license license:bsd-3)))
 
-(define-public python2-feedgenerator
-  (package-with-python2 python-feedgenerator))
-
 (define-public python-jsonrpc-server
   (package
     (name "python-jsonrpc-server")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 09/12] gnu: Remove python2-openid-cla.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-10-ben@sturm.com.au
Remove Python 2 leaf package.

* gnu/packages/python-web.scm (python2-openid-cla): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f3a3523d44..67bb12d6cf 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1516,9 +1516,6 @@ Databricks REST APIs.")
 contributor license agreement extension for python-openid.")
     (license license:bsd-3)))
 
-(define-public python2-openid-cla
-  (package-with-python2 python-openid-cla))
-
 (define-public python-openid-teams
   (package
     (name "python-openid-teams")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 04/12] gnu: Remove python2-configobj.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-5-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-configobj): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bfadc92166..143ce91494 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11678,9 +11678,6 @@ config files.")
     (home-page "https://github.com/DiffSK/configobj")
     (license license:bsd-3)))
 
-(define-public python2-configobj
-  (package-with-python2 python-configobj))
-
 (define-public python-configargparse
   (package
     (name "python-configargparse")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 10/12] gnu: Remove python2-openid.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-11-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-openid): Remove variable.
---
gnu/packages/python-web.scm | 24 ------------------------
1 file changed, 24 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 67bb12d6cf..e556f0c0ac 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1331,7 +1331,6 @@ is Python’s.")
           (lambda _
             (invoke "coverage" "run" "-m"
                     "unittest" "openid.test.test_suite"))))))
-    (properties `((python2-variant . ,(delay python2-openid))))
     (propagated-inputs
      `(("python-defusedxml" ,python-defusedxml)))
     (native-inputs
@@ -1344,29 +1343,6 @@ is Python’s.")
 for clients and servers.")
     (license license:asl2.0)))
 
-(define-public python2-openid
-  (package
-    (name "python2-openid")
-    (version "2.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-openid" version))
-       (sha256
-        (base32
-         "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"))))
-    (build-system python-build-system)
-    (arguments
-     ;; Python 3 support is in `python3-openid`, a separate package.
-     `(#:python ,python-2
-       ;; Tests aren't initialized correctly.
-       #:tests? #f))
-    (home-page "https://github.com/openid/python-openid")
-    (synopsis "OpenID support for servers and consumers")
-    (description "This library provides OpenID authentication for Python, both
-for clients and servers.")
-    (license license:asl2.0)))
-
 (define-public python-cssutils
   (package
     (name "python-cssutils")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 12/12] gnu: Remove python2-translitcodec.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-13-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-translitcodec): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 34ffd8a662..b290cbcdce 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13249,9 +13249,6 @@ best-effort representations using smaller coded character sets (ASCII,
 ISO 8859, etc.).")
     (license license:expat)))
 
-(define-public python2-translitcodec
-  (package-with-python2 python-translitcodec))
-
 (define-public python-anyqt
   (package
     (name "python-anyqt")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 05/12] gnu: Remove python2-email-validator.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-6-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-email-validator): Remove variable.
---
gnu/packages/python-xyz.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 143ce91494..f4a979705f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15125,9 +15125,6 @@ simple, lightweight implementation.")
      "This library validates email address syntax and deliverability.")
     (license license:cc0)))
 
-(define-public python2-email-validator
-  (package-with-python2 python-email-validator))
-
 (define-public python-ukpostcodeparser
   (package
     (name "python-ukpostcodeparser")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 06/12] gnu: Remove python2-wtforms.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-7-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-wtforms): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b75cb5ddfd..fd37fab283 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4173,9 +4173,6 @@ for Python web development.  It is very similar to the web form API
 available in Django, but is a standalone package.")
     (license license:bsd-3)))
 
-(define-public python2-wtforms
-  (package-with-python2 python-wtforms))
-
 (define-public python-paste
   (package
     (name "python-paste")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 07/12] gnu: Remove python2-pastescript.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-8-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-web.scm (python2-pastescript): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fd37fab283..a1824df1c6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4243,9 +4243,6 @@ variety of features, from launching web applications to bootstrapping project
 layouts.")
     (license license:expat)))
 
-(define-public python2-pastescript
-  (package-with-python2 python-pastescript))
-
 (define-public python2-urlgrabber
   (package
     (name "python2-urlgrabber")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 08/12] gnu: Remove python2-openid-teams.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-9-ben@sturm.com.au
Remove Python 2 leaf package.

* gnu/packages/python-web.scm (python2-openid-teams): Remove variable.
---
gnu/packages/python-web.scm | 3 ---
1 file changed, 3 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a1824df1c6..f3a3523d44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1539,9 +1539,6 @@ contributor license agreement extension for python-openid.")
 teams extension for python-openid.")
     (license license:bsd-3)))
 
-(define-public python2-openid-teams
-  (package-with-python2 python-openid-teams))
-
 (define-public python-priority
   (package
     (name "python-priority")
-- 
2.33.0
B
B
Ben Sturmfels wrote on 2 Sep 2021 07:30
[v2 11/12] gnu: Remove python2-celery.
(address . 49993@debbugs.gnu.org)(name . Ben Sturmfels)(address . ben@sturm.com.au)
20210902053042.24219-12-ben@sturm.com.au
Remove Python 2 leaf package possibly added for Python 2 MediaGoblin.

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
---
gnu/packages/python-xyz.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f4a979705f..34ffd8a662 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13223,16 +13223,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.33.0
?