GNU bug report logs - #45111
[PATCH 0/3] Update python-dnspython and b4

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 45111 in the body.
You can then email your comments to 45111 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] Update python-dnspython and b4
Date: Tue, 08 Dec 2020 02:44:03 GMT

The recent release of b4 adds a couple of dependencies, including the latest
version (2.0.0) of python-dnspython.  This series updates python-dnspython
from 1.16.0 to 2.0.0, keeping a definition for the older version around for
three packages that don't support the new version.  (This includes two
packages that had python2-dnspython as input, as dnspython 2.0.0 dropped
support for Python 2).

  [1/3] gnu: python-dnspython: Fix indentation.
  [2/3] gnu: python-dnspython: Update to 2.0.0.
  [3/3] gnu: b4: Update to 0.6.1.

 gnu/packages/ebook.scm           |  2 +-
 gnu/packages/finance.scm         |  2 +-
 gnu/packages/python-xyz.scm      | 51 ++++++++++++++++++++------------
 gnu/packages/version-control.scm | 28 +++++-------------
 gnu/packages/web.scm             |  2 +-
 5 files changed, 43 insertions(+), 42 deletions(-)


base-commit: 608113c083312d31d74a7a395c8537dc32484c3d
-- 
2.29.2.576.ga3fc446d84

Message #8 received at 45111 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 45111 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: python-dnspython: Fix indentation.
Date: Tue, 08 Dec 2020 02:46:38 GMT

* gnu/packages/python-xyz.scm (python-dnspython): Fix indentation.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d07c91121a..c20e32fd79 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13380,24 +13380,24 @@ (define-public python2-lazy-object-proxy
 
 (define-public python-dnspython
   (package
-  (name "python-dnspython")
-  (version "1.16.0")
-  (source (origin
-            (method url-fetch)
-            (uri (string-append "http://www.dnspython.org/kits/"
-                                version "/dnspython-" version ".tar.gz"))
-            (sha256
-             (base32
-              "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
-  (build-system python-build-system)
-  (arguments '(#:tests? #f)) ; XXX: requires internet access
-  (home-page "http://www.dnspython.org")
-  (synopsis "DNS toolkit for Python")
-  (description
-   "dnspython is a DNS toolkit for Python.  It supports almost all record
+    (name "python-dnspython")
+    (version "1.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.dnspython.org/kits/"
+                                  version "/dnspython-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+    (build-system python-build-system)
+    (arguments '(#:tests? #f))          ; XXX: requires internet access
+    (home-page "http://www.dnspython.org")
+    (synopsis "DNS toolkit for Python")
+    (description
+     "dnspython is a DNS toolkit for Python.  It supports almost all record
 types.  It can be used for queries, zone transfers, and dynamic updates.
 It supports TSIG authenticated messages and EDNS0.")
-  (license license:expat)))
+    (license license:expat)))
 
 (define-public python2-dnspython
   (package-with-python2 python-dnspython))
-- 
2.29.2.576.ga3fc446d84

Message #11 received at 45111 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 45111 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: python-dnspython: Update to 2.0.0.
Date: Tue, 08 Dec 2020 02:46:40 GMT

* gnu/packages/python-xyz.scm (python-dnspython): Update to 2.0.0.
[source]: Download from pypi.
[native-inputs]: Add unzip.
[home-page]: Prefer https.
(python-dnspython-1.16):
(python2-dnspython-1.16): New variables.
* gnu/packages/ebook.scm (calibre):
* gnu/packages/web.scm (linkchecker): Use python2-dnspython-1.16.
* gnu/packages/finance.scm (electrum): Use python-dnspython-1.16.
---
 gnu/packages/ebook.scm      |  2 +-
 gnu/packages/finance.scm    |  2 +-
 gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++--------
 gnu/packages/web.scm        |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a23c677880..a98fea707b 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -149,7 +149,7 @@ (define-public calibre
        ("python2-css-parser" ,python2-css-parser)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
-       ("python2-dnspython" ,python2-dnspython)
+       ("python2-dnspython" ,python2-dnspython-1.16)
        ("python2-dukpy" ,python2-dukpy)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-html2text" ,python2-html2text)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index b19d28c123..1f97077fc6 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -524,7 +524,7 @@ (define-public electrum
        ("python-aiohttp-socks" ,python-aiohttp-socks)
        ("python-aiorpcx" ,python-aiorpcx)
        ("python-certifi" ,python-certifi)
-       ("python-dnspython" ,python-dnspython)
+       ("python-dnspython" ,python-dnspython-1.16)
        ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
     (arguments
      `(#:tests? #f                      ; no tests
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c20e32fd79..10b271de21 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben <at> gmail.com>
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa <at> gmail.com>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2015, 2017 Kyle Meyer <kyle <at> kyleam.com>
+;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle <at> kyleam.com>
 ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym+a <at> scratchpost.org>
 ;;; Copyright © 2016 Lukas Gradl <lgradl <at> openmailbox.org>
@@ -13381,17 +13381,17 @@ (define-public python2-lazy-object-proxy
 (define-public python-dnspython
   (package
     (name "python-dnspython")
-    (version "1.16.0")
+    (version "2.0.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://www.dnspython.org/kits/"
-                                  version "/dnspython-" version ".tar.gz"))
+              (uri (pypi-uri "dnspython" version ".zip"))
               (sha256
                (base32
-                "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+                "1dyip5ygqqhrgcaiy7qzjpndl9xciip186paxqwkm726fj9z0jh4"))))
     (build-system python-build-system)
+    (native-inputs `(("unzip" ,unzip)))
     (arguments '(#:tests? #f))          ; XXX: requires internet access
-    (home-page "http://www.dnspython.org")
+    (home-page "https://www.dnspython.org")
     (synopsis "DNS toolkit for Python")
     (description
      "dnspython is a DNS toolkit for Python.  It supports almost all record
@@ -13399,8 +13399,21 @@ (define-public python-dnspython
 It supports TSIG authenticated messages and EDNS0.")
     (license license:expat)))
 
-(define-public python2-dnspython
-  (package-with-python2 python-dnspython))
+(define-public python-dnspython-1.16
+  (package
+    (inherit python-dnspython)
+    (version "1.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.dnspython.org/kits/"
+                                  version "/dnspython-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+    (native-inputs '())))
+
+(define-public python2-dnspython-1.16
+  (package-with-python2 python-dnspython-1.16))
 
 (define-public python-py3dns
   (package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 794e2c919d..4480ab9eb7 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6418,7 +6418,7 @@ (define-public linkchecker
          "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
     (build-system python-build-system)
     (inputs
-     `(("python2-dnspython" ,python2-dnspython)
+     `(("python2-dnspython" ,python2-dnspython-1.16)
        ("python2-pyxdg" ,python2-pyxdg)
        ("python2-requests" ,python2-requests)))
     (native-inputs
-- 
2.29.2.576.ga3fc446d84

Message #14 received at 45111 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 45111 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: b4: Update to 0.6.1.
Date: Tue, 08 Dec 2020 02:46:42 GMT

* gnu/packages/version-control.scm (b4): Update to 0.6.1.
[source]: Download from pypi, which now includes the manpage.
[arguments]: Remove now unnecessary install-manpages phase.
[inputs]: Add python-dkimpy and python-dnspython.
---
 gnu/packages/version-control.scm | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index a3588009c0..f5df1a7a81 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2317,31 +2317,19 @@ (define-public grokmirror
 (define-public b4
   (package
     (name "b4")
-    (version "0.5.3")
+    (version "0.6.1")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.kernel.org/pub/scm/utils/b4/b4.git")
-             (commit (string-append "v" version))))
-       (file-name (string-append name "-" version "-checkout"))
+       (method url-fetch)
+       (uri (pypi-uri "b4" version))
        (sha256
-        (base32 "0bnjs758blll2i70r4qh3khma7dly5lb8s6kzn5a3p54md91s8v5"))))
+        (base32 "01qid6mvddikcdpf2ihsyn8x3z5j2n64g0ip9pqbx42hrc50pmcz"))))
     (build-system python-build-system)
-    (arguments
-     `(#:tests? #f                      ; No tests.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-manpages
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((man (string-append (assoc-ref outputs "out")
-                                       "/man/man5/")))
-               (mkdir-p man)
-               (for-each (lambda (file) (install-file file man))
-                         (find-files "man" "\\.[1-8]$")))
-             #t)))))
+    (arguments '(#:tests? #f))          ; No tests.
     (inputs
-     `(("python-requests" ,python-requests)))
+     `(("python-dkimpy" ,python-dkimpy)
+       ("python-dnspython" ,python-dnspython)
+       ("python-requests" ,python-requests)))
     (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
     (synopsis "Tool for working with patches in public-inbox archives")
     (description
-- 
2.29.2.576.ga3fc446d84

Message #19 received at 45111-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Kyle Meyer <kyle <at> kyleam.com>
Cc: 45111-done <at> debbugs.gnu.org
Subject: Re: [bug#45111] [PATCH 0/3] Update python-dnspython and b4
Date: Mon, 14 Dec 2020 12:27:53 +0100

Hi,

Kyle Meyer <kyle <at> kyleam.com> skribis:

> The recent release of b4 adds a couple of dependencies, including the latest
> version (2.0.0) of python-dnspython.  This series updates python-dnspython
> from 1.16.0 to 2.0.0, keeping a definition for the older version around for
> three packages that don't support the new version.  (This includes two
> packages that had python2-dnspython as input, as dnspython 2.0.0 dropped
> support for Python 2).
>
>   [1/3] gnu: python-dnspython: Fix indentation.
>   [2/3] gnu: python-dnspython: Update to 2.0.0.
>   [3/3] gnu: b4: Update to 0.6.1.
>
>  gnu/packages/ebook.scm           |  2 +-
>  gnu/packages/finance.scm         |  2 +-
>  gnu/packages/python-xyz.scm      | 51 ++++++++++++++++++++------------
>  gnu/packages/version-control.scm | 28 +++++-------------
>  gnu/packages/web.scm             |  2 +-
>  5 files changed, 43 insertions(+), 42 deletions(-)

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.