[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Port make_graph to python3

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
1ce73fcb by Bernhard M. Wiedemann at 2019-02-06T15:10:34Z
Port make_graph to python3

because python2 will be EOL soon
and openSUSE only has python3-rpy2

- - - - -


3 changed files:

- INSTALL
- bin/make_graph.py
- update_jdn.sh


Changes:

=====================================
INSTALL
=====================================
@@ -148,7 +148,7 @@ Your clone of the jenkins git (https://salsa.debian.org/qa/jenkins.debian.net) w
 
 Some dependencies:
 ----
-sudo apt install python3 python3-psycopg2 python3-yaml sqlite3 python-rpy2 dctrl-tools
+sudo apt install python3 python3-psycopg2 python3-rpy2 python3-yaml sqlite3 dctrl-tools
 ----
 
 Create a user jenkins for testing. Create the following directories:


=====================================
bin/make_graph.py
=====================================
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2019 Holger Levsen (holger at layer-acht.org)
@@ -12,7 +12,7 @@ from rpy2.robjects.packages import importr
 
 def main():
     if len(sys.argv) != 8:
-        print "we need exactly seven params: csv-file-in, png-out-file, color, mainlabel, ylabl, width, height"
+        print("we need exactly seven params: csv-file-in, png-out-file, color, mainlabel, ylabl, width, height")
         return
     filein = sys.argv[1]
     fileout = sys.argv[2]


=====================================
update_jdn.sh
=====================================
@@ -433,6 +433,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-debian 
 				python3-pystache
 				python3-requests
+				python3-rpy2 
 				python3-sqlalchemy
 				python3-xdg
 				python3-yaml
@@ -441,7 +442,6 @@ if [ -f /etc/debian_version ] ; then
 				python-imaging 
 				python-lzma 
 				python-pip 
-				python-rpy2 
 				python-setuptools 
 				python-twisted 
 				python-yaml 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/1ce73fcb9c528d204197155eb019767b1f7ee0e6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/1ce73fcb9c528d204197155eb019767b1f7ee0e6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190206/c9744a43/attachment-0001.html>