Commit e3c344c2 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

software/plantuml: move to python3

See merge request nexedi/slapos!850
parents e5e18739 1d64eb15
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
<= tomcat9 <= tomcat9
[tomcat7] [tomcat7]
recipe = hexagonit.recipe.download recipe = slapos.recipe.build:download-unpacked
ignore-existing = true ignore-existing = true
strip-top-level-dir = true strip-top-level-dir = true
url = https://archive.apache.org/dist/tomcat/tomcat-7/v${:version}/bin/apache-tomcat-${:version}.tar.gz 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 ...@@ -18,7 +18,7 @@ version = 7.0.100
md5sum = 79be4ba5a6e770730a4be3d5cb3c7862 md5sum = 79be4ba5a6e770730a4be3d5cb3c7862
[tomcat9] [tomcat9]
recipe = hexagonit.recipe.download recipe = slapos.recipe.build:download-unpacked
ignore-existing = true ignore-existing = true
strip-top-level-dir = true strip-top-level-dir = true
url = https://archive.apache.org/dist/tomcat/tomcat-9/v${:version}/bin/apache-tomcat-${:version}.tar.gz url = https://archive.apache.org/dist/tomcat/tomcat-9/v${:version}/bin/apache-tomcat-${:version}.tar.gz
......
...@@ -15,6 +15,9 @@ parts = ...@@ -15,6 +15,9 @@ parts =
slapos-cookbook slapos-cookbook
instance instance
[python]
part = python3
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -6,14 +6,15 @@ extends = ...@@ -6,14 +6,15 @@ extends =
part = python3 part = python3
[eggs] [eggs]
eggs -= eggs +=
# plantuml is not Py3-compatible # plantuml 0.3.0 is only available for Python 3
${slapos.test.plantuml-setup:egg} ${slapos.test.plantuml-setup:egg}
[template] [template]
extra = extra =
${slapos.test.helloworld-setup:setup} ${slapos.test.helloworld-setup:setup}
${slapos.test.monitor-setup:setup} ${slapos.test.monitor-setup:setup}
${slapos.test.plantuml-setup:setup}
${slapos.test.powerdns-setup:setup} ${slapos.test.powerdns-setup:setup}
${slapos.test.proftpd-setup:setup} ${slapos.test.proftpd-setup:setup}
${slapos.test.repman-setup:setup} ${slapos.test.repman-setup:setup}
...@@ -189,7 +189,6 @@ eggs = ...@@ -189,7 +189,6 @@ eggs =
${slapos.test.jstestnode-setup:egg} ${slapos.test.jstestnode-setup:egg}
${slapos.test.kvm-setup:egg} ${slapos.test.kvm-setup:egg}
${slapos.test.monitor-setup:egg} ${slapos.test.monitor-setup:egg}
${slapos.test.plantuml-setup:egg}
${slapos.test.powerdns-setup:egg} ${slapos.test.powerdns-setup:egg}
${slapos.test.proftpd-setup:egg} ${slapos.test.proftpd-setup:egg}
${slapos.test.re6stnet-setup:egg} ${slapos.test.re6stnet-setup:egg}
...@@ -256,7 +255,6 @@ extra = ...@@ -256,7 +255,6 @@ extra =
${slapos.test.erp5-setup:setup} ${slapos.test.erp5-setup:setup}
${slapos.test.htmlvalidatorserver-setup:setup} ${slapos.test.htmlvalidatorserver-setup:setup}
${slapos.test.slapos-master-setup:setup} ${slapos.test.slapos-master-setup:setup}
${slapos.test.plantuml-setup:setup}
${slapos.test.re6stnet-setup:setup} ${slapos.test.re6stnet-setup:setup}
${slapos.test.seleniumserver-setup:setup} ${slapos.test.seleniumserver-setup:setup}
${slapos.test.jstestnode-setup:setup} ${slapos.test.jstestnode-setup:setup}
...@@ -280,7 +278,7 @@ forcediphttpsadapter = 1.0.1 ...@@ -280,7 +278,7 @@ forcediphttpsadapter = 1.0.1
httplib2 = 0.11.3 httplib2 = 0.11.3
image = 1.5.25 image = 1.5.25
paramiko = 2.4.2 paramiko = 2.4.2
plantuml = 0.1.1 plantuml = 0.3.0
pysftp = 0.2.9 pysftp = 0.2.9
requests-toolbelt = 0.8.0 requests-toolbelt = 0.8.0
selenium = 3.141.0 selenium = 3.141.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment