[bug#49272] [PATCH 00/10] broken Python 2 packages removal

[bug#49272] [PATCH 00/10] broken Python 2 packages removal

[zimoun]

Hi,

Because Python 2 is EOL and these packages fail to build, there are removed.
At the end of the series, "make as-derivation" successes, so everything seems
fine.  Note that because sometimes the graph is rewritten, the dependency
graph needs some care.

Last, note that python2-terminado is broken because of the rewrite of
'python-tornado-6'; replacing instead by 'python2-tornado' does not fix the
build, at least at first quick look.  It is not worth to try to keep it build,
IMHO.

Cheers,
simon


zimoun (10):
  gnu: python2-nbconvert: Remove package.
  gnu: python2-jupyter-client: Remove package.
  gnu: python2-ipython: Remove package.
  gnu: python2-nbformat: Remove package.
  gnu: python2-terminado: Remove package.
  gnu: python2-toolz: Remove package.
  gnu: python2-testpath: Remove package.
  gnu: python2-pyzmq: Remove package.
  gnu: python2-pyfakefs: Remove package.
  gnu: python2-pgpdump: Remove package.

 gnu/packages/check.scm         |   8 +--
 gnu/packages/python-crypto.scm |  31 ---------
 gnu/packages/python-web.scm    |  12 +---
 gnu/packages/python-xyz.scm    | 121 +--------------------------------
 4 files changed, 3 insertions(+), 169 deletions(-)


base-commit: 5ed105a8bb1a812975496dc3a091596355a0234c
-- 
2.32.0

[bug#49272] [PATCH 01/10] gnu: python2-nbconvert: Remove package.

[zimoun]

* gnu/packages/python-xyz.scm (python2-nbconvert): Remove variable.
---
 gnu/packages/python-xyz.scm | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bb28120c25..9d2dc492db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11314,38 +11314,7 @@ convert an @code{.ipynb} notebook file into various static formats including:
 @item ReStructured Text (rst)
 @item executable script
 @end enumerate\n")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-nbconvert))))))
-
-(define-public python2-nbconvert
-  (let ((parent
-         (package-with-python2
-          (strip-python2-variant python-nbconvert))))
-    (package
-      (inherit parent)
-      (version "5.0.0b1")
-      (source
-       (origin
-         (method url-fetch)
-         (uri (pypi-uri "nbconvert" version))
-         (sha256
-          (base32
-           "0brclbb18l4nmd5qy3dl9wn05rjdh1fz4rmzdlfqacj12rcdvdgp"))))
-      (arguments
-       `(;; The "bdist_egg" target is disabled by default, causing the installation
-         ;; to fail.
-         #:configure-flags (list "bdist_egg")
-         ;; FIXME: 5 failures, 40 errors.
-         #:tests? #f))
-      (propagated-inputs
-       `(("python-bleach" ,python-bleach)
-         ("python-entrypoints" ,python-entrypoints)
-         ("python-jinja2" ,python-jinja2)
-         ("python-jupyter-core" ,python-jupyter-core)
-         ("python-mistune" ,python-mistune)
-         ("python-nbformat" ,python-nbformat)
-         ("python-pygments" ,python-pygments)
-         ("python-traitlets" ,python-traitlets))))))
+    (license license:bsd-3)))
 
 (define-public python-notebook
   (package
-- 
2.32.0

[bug#49272] [PATCH 02/10] gnu: python2-jupyter-client: Remove package.

[zimoun]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9d2dc492db..79dfa2faaa 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7889,9 +7889,6 @@ installing @code{kernelspec}s for use with Jupyter frontends.")
             ,@(package-arguments base)))
         (native-inputs `())))))
 
-(define-public python2-jupyter-client
-  (package-with-python2 python-jupyter-client))
-
 (define-public python-ipykernel
   (package
     (name "python-ipykernel")
-- 
2.32.0

[bug#49272] [PATCH 03/10] gnu: python2-ipython: Remove package.

[zimoun]

Commit a0a8fdeaf2db2695dd7944ee7d2e5eeade9e600b removed the variable
'python2-jupyer-core' which breaks the dependency 'python2-nbformat'.

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 79dfa2faaa..156e5baef7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8076,70 +8076,6 @@ callback signature using a prototype function.")
      "IPython provides a rich architecture for interactive computing with:
 Powerful interactive shells, a browser-based notebook, support for interactive
 data visualization, embeddable interpreters and tools for parallel
-computing.")
-    (properties `((python2-variant . ,(delay python2-ipython))))
-    (license license:bsd-3)))
-
-;; This is the latest release of the LTS version of ipython with support for
-;; Python 2.7 and Python 3.x.  Later non-LTS versions starting from 6.0 have
-;; dropped support for Python 2.7.
-(define-public python2-ipython
-  (package
-    (name "python2-ipython")
-    (version "5.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "ipython" version ".tar.gz"))
-       (sha256
-        (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     `(("python2-backports-shutil-get-terminal-size"
-        ,python2-backports-shutil-get-terminal-size)
-       ("python2-pathlib2" ,python2-pathlib2)
-       ("python2-pyzmq" ,python2-pyzmq)
-       ("python2-prompt-toolkit" ,python2-prompt-toolkit-1)
-       ("python2-terminado" ,python2-terminado)
-       ("python2-matplotlib" ,python2-matplotlib)
-       ("python2-numpy" ,python2-numpy)
-       ("python2-numpydoc" ,python2-numpydoc)
-       ("python2-jinja2" ,python2-jinja2)
-       ("python2-mistune" ,python2-mistune)
-       ("python2-pexpect" ,python2-pexpect)
-       ("python2-pickleshare" ,python2-pickleshare)
-       ("python2-simplegeneric" ,python2-simplegeneric)
-       ("python2-jsonschema" ,python2-jsonschema)
-       ("python2-traitlets" ,python2-traitlets)
-       ("python2-nbformat" ,python2-nbformat)
-       ("python2-pygments" ,python2-pygments)))
-    (inputs
-     `(("readline" ,readline)
-       ("which" ,which)))
-    (native-inputs
-     `(("graphviz" ,graphviz)
-       ("pkg-config" ,pkg-config)
-       ("python2-requests" ,python2-requests) ;; for tests
-       ("python2-testpath" ,python2-testpath)
-       ("python2-mock" ,python2-mock)
-       ("python2-nose" ,python2-nose)))
-    (arguments
-     `(#:python ,python-2
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'delete-broken-tests
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; These tests throw errors for unknown reasons.
-             (delete-file "IPython/core/tests/test_displayhook.py")
-             (delete-file "IPython/core/tests/test_magic_terminal.py")
-             (delete-file "IPython/core/tests/test_profile.py")
-             #t)))))
-    (home-page "https://ipython.org")
-    (synopsis "IPython is a tool for interactive computing in Python")
-    (description
-     "IPython provides a rich architecture for interactive computing with:
-Powerful interactive shells, a browser-based notebook, support for interactive
-data visualization, embeddable interpreters and tools for parallel
 computing.")
     (license license:bsd-3)))
 
-- 
2.32.0

[bug#49272] [PATCH 04/10] gnu: python2-nbformat: Remove package.

[zimoun]

Follow the remove of 'python2-jupyter-core' by commit
a0a8fdeaf2db2695dd7944ee7d2e5eeade9e600b.

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 156e5baef7..8206d1f88f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10956,23 +10956,8 @@ drafts 04, 06 and 07.")
     (synopsis "Jupyter Notebook format")
     (description "This package provides the reference implementation of the
 Jupyter Notebook format and Python APIs for working with notebooks.")
-    (properties `((python2-variant . ,(delay python2-nbformat))))
     (license license:bsd-3)))
 
-(define-public python2-nbformat
-  (let ((parent (package-with-python2
-                 (strip-python2-variant python-nbformat))))
-    (package
-      (inherit parent)
-      (version "4.4.0")
-      (source
-       (origin
-         (method url-fetch)
-         (uri (pypi-uri "nbformat" version))
-         (sha256
-          (base32
-           "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp")))))))
-
 (define-public python-bleach
   (package
     (name "python-bleach")
-- 
2.32.0

[bug#49272] [PATCH 05/10] gnu: python2-terminado: Remove package.

[zimoun]

* gnu/packages/python-web.scm (python2-terminado): Remove variable.
---
 gnu/packages/python-web.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5cddd37d5d..656f310dc1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1772,17 +1772,7 @@ web framework, either via the basic or digest authentication schemes.")
     (synopsis "Terminals served to term.js using Tornado websockets")
     (description "This package provides a Tornado websocket backend for the
 term.js Javascript terminal emulator library.")
-    (license license:bsd-2)
-    (properties `((python2-variant . ,(delay python2-terminado))))))
-
-(define-public python2-terminado
-  (let ((terminado (package-with-python2 (strip-python2-variant python-terminado))))
-    (package/inherit terminado
-      (propagated-inputs
-       `(("python2-backport-ssl-match-hostname"
-          ,python2-backport-ssl-match-hostname)
-         ("python2-futures" ,python2-futures)
-          ,@(package-propagated-inputs terminado))))))
+    (license license:bsd-2)))
 
 (define-public python-wsgi-intercept
   (package
-- 
2.32.0

[bug#49272] [PATCH 06/10] gnu: python2-toolz: Remove package.

[zimoun]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8206d1f88f..69c161d92f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21255,9 +21255,6 @@ library's @code{threading} module.")
 functions, and dictionaries.")
     (license license:bsd-3)))
 
-(define-public python2-toolz
-  (package-with-python2 python-toolz))
-
 (define-public python-cytoolz
   (package
     (name "python-cytoolz")
-- 
2.32.0

[bug#49272] [PATCH 07/10] gnu: python2-testpath: Remove package.

[zimoun]

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

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 658905a7f5..55e4cc96ab 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1799,9 +1799,6 @@ and commands.  It contains functions to check things on the file system, and
 tools for mocking system commands and recording calls to those.")
     (license license:expat)))
 
-(define-public python2-testpath
-  (package-with-python2 python-testpath))
-
 (define-public python-testlib
   (package
     (name "python-testlib")
-- 
2.32.0

[bug#49272] [PATCH 08/10] gnu: python2-pyzmq: Remove package.

[zimoun]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69c161d92f..e7695b6318 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9149,9 +9149,6 @@ applications.")
      "PyZMQ is the official Python binding for the ZeroMQ messaging library.")
     (license license:bsd-4)))
 
-(define-public python2-pyzmq
-  (package-with-python2 python-pyzmq))
-
 (define-public python-pep8
   ;; This package has been renamed to ‘pycodestyle’ and is no longer updated.
   ;; Its last release (1.7.1) adds only a scary warning to this effect, breaking
-- 
2.32.0

[bug#49272] [PATCH 09/10] gnu: python2-pyfakefs: Remove package.

[zimoun]

* gnu/packages/check.scm (python2-pyfakefs): Remove variable.
---
 gnu/packages/check.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 55e4cc96ab..d4820d911d 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2849,16 +2849,13 @@ under test to interact with a fake file system instead of the real file
 system.  The code under test requires no modification to work with pyfakefs.")
     (license license:asl2.0)))
 
-(define-public python2-pyfakefs
-  (package-with-python2 python-pyfakefs))
-
 ;; This minimal variant is used to avoid a circular dependency between
 ;; python2-importlib-metadata, which requires pyfakefs for its tests, and
 ;; python2-pytest, which requires python2-importlib-metadata.
 (define-public python2-pyfakefs-bootstrap
   (hidden-package
    (package
-     (inherit python2-pyfakefs)
+     (inherit (package-with-python2 python-pyfakefs))
      (name "python2-pyfakefs-bootstrap")
      (native-inputs '())
      (arguments
-- 
2.32.0

[bug#49272] [PATCH 10/10] gnu: python2-pgpdump: Remove package.

[zimoun]

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

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 278657c57a..0134c8c427 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -826,37 +826,6 @@ of improving usability, security and speed.")
 (define-public python2-pynacl
   (package-with-python2 python-pynacl))
 
-(define-public python2-pgpdump
-  (package
-    (name "python2-pgpdump")
-    (version "1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pgpdump" version))
-       (sha256
-        (base32
-         "0s4nh8h7qsdj2yf29bspjs1zvxd4lcd11r6g11dp7fppgf2h0iqw"))))
-    (build-system python-build-system)
-
-    ;; Currently fails to build with Python 3.
-    (arguments `(#:python ,python-2))
-
-    (home-page "https://github.com/toofishes/python-pgpdump")
-    (synopsis "Python library for parsing PGP packets")
-    (description
-     "Python-pgpdump is an OpenPGP packet parser based on
-@uref{http://www.mew.org/~kazu/proj/pgpdump/, pgpdump}.  It notably supports:
-
-@itemize
-@item signature packets;
-@item public key packets;
-@item secret key packets;
-@item trust, user ID, and user attribute packets;
-@item ASCII-armor decoding and CRC check.
-@end itemize\n")
-    (license license:bsd-3)))
-
 (define-public python-blurhash
   (package
     (name "python-blurhash")
-- 
2.32.0

bug#49272: [PATCH 00/10] broken Python 2 packages removal

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]

On Tue, Jun 29, 2021 at 03:07:58PM +0200, zimoun wrote:
> Hi,
> 
> Because Python 2 is EOL and these packages fail to build, there are removed.
> At the end of the series, "make as-derivation" successes, so everything seems
> fine.  Note that because sometimes the graph is rewritten, the dependency
> graph needs some care.
> 
> Last, note that python2-terminado is broken because of the rewrite of
> 'python-tornado-6'; replacing instead by 'python2-tornado' does not fix the
> build, at least at first quick look.  It is not worth to try to keep it build,
> IMHO.
> 
> Cheers,
> simon

Looks good to me! Patches pushed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]