software/plantuml: move to python3

See merge request nexedi/slapos!850

component/tomcat/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 <= tomcat9
 
 [tomcat7]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 ignore-existing = true
 strip-top-level-dir = true
 url = https://archive.apache.org/dist/tomcat/tomcat-7/v${:version}/bin/apache-tomcat-${:version}.tar.gz
@@ -18,7 +18,7 @@ version = 7.0.100
 md5sum = 79be4ba5a6e770730a4be3d5cb3c7862
 
 [tomcat9]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 ignore-existing = true
 strip-top-level-dir = true
 url = https://archive.apache.org/dist/tomcat/tomcat-9/v${:version}/bin/apache-tomcat-${:version}.tar.gz

software/plantuml/software.cfg

@@ -15,6 +15,9 @@ parts =
   slapos-cookbook
   instance
 
+[python]
+part = python3
+
 [instance]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}

software/slapos-sr-testing/software-py3.cfg

@@ -6,14 +6,15 @@ extends =
 part = python3
 
 [eggs]
-eggs -=
-# plantuml is not Py3-compatible
+eggs +=
+# plantuml 0.3.0 is only available for Python 3
   ${slapos.test.plantuml-setup:egg}
 
 [template]
 extra =
   ${slapos.test.helloworld-setup:setup}
   ${slapos.test.monitor-setup:setup}
+  ${slapos.test.plantuml-setup:setup}
   ${slapos.test.powerdns-setup:setup}
   ${slapos.test.proftpd-setup:setup}
   ${slapos.test.repman-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -189,7 +189,6 @@ eggs =
   ${slapos.test.jstestnode-setup:egg}
   ${slapos.test.kvm-setup:egg}
   ${slapos.test.monitor-setup:egg}
-  ${slapos.test.plantuml-setup:egg}
   ${slapos.test.powerdns-setup:egg}
   ${slapos.test.proftpd-setup:egg}
   ${slapos.test.re6stnet-setup:egg}
@@ -256,7 +255,6 @@ extra =
   ${slapos.test.erp5-setup:setup}
   ${slapos.test.htmlvalidatorserver-setup:setup}
   ${slapos.test.slapos-master-setup:setup}
-  ${slapos.test.plantuml-setup:setup}
   ${slapos.test.re6stnet-setup:setup}
   ${slapos.test.seleniumserver-setup:setup}
   ${slapos.test.jstestnode-setup:setup}
@@ -280,7 +278,7 @@ forcediphttpsadapter = 1.0.1
 httplib2 = 0.11.3
 image = 1.5.25
 paramiko = 2.4.2
-plantuml = 0.1.1
+plantuml = 0.3.0
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0