Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
e3c344c2
Commit
e3c344c2
authored
Nov 06, 2020
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
software/plantuml: move to python3
See merge request
!850
parents
e5e18739
1d64eb15
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
component/tomcat/buildout.cfg
component/tomcat/buildout.cfg
+2
-2
software/plantuml/software.cfg
software/plantuml/software.cfg
+3
-0
software/slapos-sr-testing/software-py3.cfg
software/slapos-sr-testing/software-py3.cfg
+3
-2
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+1
-3
No files found.
component/tomcat/buildout.cfg
View file @
e3c344c2
...
...
@@ -10,7 +10,7 @@ parts =
<= tomcat9
[tomcat7]
recipe =
hexagonit.recipe.downloa
d
recipe =
slapos.recipe.build:download-unpacke
d
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.downloa
d
recipe =
slapos.recipe.build:download-unpacke
d
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
View file @
e3c344c2
...
...
@@ -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
View file @
e3c344c2
...
...
@@ -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
View file @
e3c344c2
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment