GNU bug report logs - #35412
[PATCH 1/2] gnu: rpm: Use python3 instead of python2.

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 35412 in the body.
You can then email your comments to 35412 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: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: guix-patches <at> gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Subject: [PATCH 1/2] gnu: rpm: Use python3 instead of python2.
Date: Wed, 24 Apr 2019 12:03:21 +0200

osc depends on python-rpm and requires python3 now.

* gnu/packages/package-management.scm (rpm)[inputs]: Use python instead
of python-2.
---
 gnu/packages/package-management.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6708a761eb..f3b592b9e9 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -518,7 +518,7 @@ symlinks to the files in a common directory such as /usr/local.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("python" ,python-2)
+     `(("python" ,python)
        ("xz" ,xz)
        ("bdb" ,bdb)
        ("popt" ,popt)
--
2.21.0

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

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: 35412 <at> debbugs.gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Subject: [PATCH 2/2] gnu: osc: Update to 0.165.0.
Date: Wed, 24 Apr 2019 12:25:16 +0200

osc is now python3 compatible.

* gnu/packages/build-tools.scm (osc): Update to 0.165.0.
[arguments]: Module is now python3 only. "osc_hotshot.py" is gone.
[inputs]: Add rpm for python-rpm. Remove python2-urlgrabber. Change
m2crypto and pyurl to python3.
---
 gnu/packages/build-tools.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index daf55d84df..a572a05a49 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2018 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2018 Alex Vong <alexvong1995 <at> gmail.com>
 ;;; Copyright © 2019 Brett Gilio <brettg <at> posteo.net>
+;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
@@ -240,7 +242,7 @@ other lower-level build files.")
 (define-public osc
   (package
     (name "osc")
-    (version "0.162.1")
+    (version "0.165.0")
     (source
      (origin
        (method url-fetch)
@@ -248,12 +250,11 @@ other lower-level build files.")
                            "/archive/" version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0b4kpm96ns4smqyfjysbk2p78d36x44xprpna8zz85q1y5xn57aj"))))
+        (base32 "0w8z69fhjnlb7fm4fdvbi99kxndk63308f4mjzaljrcp4v9yr5am"))))
     (build-system python-build-system)
     (arguments
-     `(#:python ,python-2 ; Module is python2 only.
-       #:phases
-       (modify-phases %standard-phases
+     `(#:phases
+        (modify-phases %standard-phases
          (add-after 'install 'fix-filename-and-remove-unused
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
@@ -262,13 +263,11 @@ other lower-level build files.")
                (rename-file
                 (string-append bin "osc-wrapper.py")
                 (string-append bin "osc"))
-               ;; Remove unused and broken script.
-               (delete-file (string-append bin "osc_hotshot.py"))
              #t))))))
     (inputs
-     `(("python2-m2crypto" ,python2-m2crypto)
-       ("python2-pycurl" ,python2-pycurl)
-       ("python2-urlgrabber" ,python2-urlgrabber)))
+     `(("python-m2crypto" ,python-m2crypto)
+       ("python-pycurl" ,python-pycurl)
+       ("rpm" ,rpm))) ; for python-rpm
     (home-page "https://github.com/openSUSE/osc")
     (synopsis "Open Build Service command line tool")
     (description "@command{osc} is a command line interface to the Open Build
--
2.21.0

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

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: 35412 <at> debbugs.gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Subject: Re: [PATCH 2/2] gnu: osc: Update to 0.165.0.
Date: Thu, 9 May 2019 12:43:57 +0200

ping

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

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Cc: 35412-done <at> debbugs.gnu.org
Subject: Re: [bug#35412] [PATCH 1/2] gnu: rpm: Use python3 instead of python2.
Date: Sat, 11 May 2019 14:15:21 +0530

[Message part 1 (text/plain, inline)]

Thanks! I pushed your patches with a few modifications, of which the two
most notable are:

- I updated rpm to 4.14.2.1.
- GitHub autogenerated source tarballs are unstable (their hashes
change). So, I made osc use git-fetch instead of url-fetch.

[signature.asc (application/pgp-signature, inline)]

Previous Next

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