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
Joanne Hugé
slapos
Commits
05e4fbd2
Commit
05e4fbd2
authored
Sep 05, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Use python3 for caucase, jscrawler and htmlvalidatorserver softwares
See merge request
nexedi/slapos!1243
parents
8941f98b
257f451c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
15 deletions
+6
-15
software/caucase/software.cfg
software/caucase/software.cfg
+0
-2
software/caucase/test/test.py
software/caucase/test/test.py
+1
-1
software/htmlvalidatorserver/software.cfg
software/htmlvalidatorserver/software.cfg
+0
-3
software/jscrawler/software.cfg
software/jscrawler/software.cfg
+0
-3
software/jscrawler/test/test.py
software/jscrawler/test/test.py
+2
-3
software/slapos-sr-testing/software-py3.cfg
software/slapos-sr-testing/software-py3.cfg
+3
-0
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+0
-3
No files found.
software/caucase/software.cfg
View file @
05e4fbd2
...
@@ -7,8 +7,6 @@ parts +=
...
@@ -7,8 +7,6 @@ parts +=
instance
instance
caucase-eggs
caucase-eggs
[python]
part = python2.7
[instance-caucased]
[instance-caucased]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
...
software/caucase/test/test.py
View file @
05e4fbd2
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
##############################################################################
##############################################################################
from
__future__
import
unicode_literals
import
json
import
json
import
os
import
os
...
...
software/htmlvalidatorserver/software.cfg
View file @
05e4fbd2
...
@@ -15,9 +15,6 @@ parts =
...
@@ -15,9 +15,6 @@ parts =
slapos-cookbook
slapos-cookbook
template
template
[python]
part = python2.7
##########################################################
##########################################################
# Service startup scripts and configuration files
# Service startup scripts and configuration files
##########################################################
##########################################################
...
...
software/jscrawler/software.cfg
View file @
05e4fbd2
...
@@ -16,9 +16,6 @@ parts =
...
@@ -16,9 +16,6 @@ parts =
jscrawler-build
jscrawler-build
instance
instance
[python]
part = python2.7
[nodejs]
[nodejs]
<= nodejs-12.18.3
<= nodejs-12.18.3
...
...
software/jscrawler/test/test.py
View file @
05e4fbd2
...
@@ -26,8 +26,7 @@
...
@@ -26,8 +26,7 @@
##############################################################################
##############################################################################
import
os
import
os
import
logging
from
urllib.parse
import
urlparse
from
six.moves.urllib.parse
import
urlparse
import
requests
import
requests
import
time
import
time
...
@@ -51,7 +50,7 @@ class TestJSCrawler(SlapOSInstanceTestCase):
...
@@ -51,7 +50,7 @@ class TestJSCrawler(SlapOSInstanceTestCase):
self
.
send_response
(
200
)
self
.
send_response
(
200
)
self
.
send_header
(
"Content-Type"
,
"application/html"
)
self
.
send_header
(
"Content-Type"
,
"application/html"
)
self
.
end_headers
()
self
.
end_headers
()
self
.
wfile
.
write
(
'<title>Hello {}</title>'
.
format
(
self
.
_name
))
self
.
wfile
.
write
(
f'<title>Hello
{
self
.
_name
}
</title>'
.
encode
(
))
return
{
return
{
'urls'
:
'
\
n
'
.
join
([
'urls'
:
'
\
n
'
.
join
([
...
...
software/slapos-sr-testing/software-py3.cfg
View file @
05e4fbd2
...
@@ -14,6 +14,7 @@ extra-eggs +=
...
@@ -14,6 +14,7 @@ extra-eggs +=
extra =
extra =
# The following list is for SR whose buildout runs only with Python 3.
# The following list is for SR whose buildout runs only with Python 3.
caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
caucase ${slapos.test.caucase-setup:setup}
erp5testnode ${slapos.test.erp5testnode-setup:setup}
erp5testnode ${slapos.test.erp5testnode-setup:setup}
galene ${slapos.test.galene-setup:setup}
galene ${slapos.test.galene-setup:setup}
grafana ${slapos.test.grafana-setup:setup}
grafana ${slapos.test.grafana-setup:setup}
...
@@ -21,7 +22,9 @@ extra =
...
@@ -21,7 +22,9 @@ extra =
helloworld ${slapos.test.helloworld-setup:setup}
helloworld ${slapos.test.helloworld-setup:setup}
html5as ${slapos.test.html5as-setup:setup}
html5as ${slapos.test.html5as-setup:setup}
html5as-base ${slapos.test.html5as-base-setup:setup}
html5as-base ${slapos.test.html5as-base-setup:setup}
htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
hugo ${slapos.test.hugo-setup:setup}
hugo ${slapos.test.hugo-setup:setup}
jscrawler ${slapos.test.jscrawler-setup:setup}
jstestnode ${slapos.test.jstestnode-setup:setup}
jstestnode ${slapos.test.jstestnode-setup:setup}
jupyter ${slapos.test.jupyter-setup:setup}
jupyter ${slapos.test.jupyter-setup:setup}
kvm ${slapos.test.kvm-setup:setup}
kvm ${slapos.test.kvm-setup:setup}
...
...
software/slapos-sr-testing/software.cfg
View file @
05e4fbd2
...
@@ -367,12 +367,9 @@ extra =
...
@@ -367,12 +367,9 @@ extra =
# You should not add more lines here.
# You should not add more lines here.
backupserver ${slapos.test.backupserver-setup:setup}
backupserver ${slapos.test.backupserver-setup:setup}
beremiz-ide ${slapos.test.beremiz-ide-setup:setup}
beremiz-ide ${slapos.test.beremiz-ide-setup:setup}
caucase ${slapos.test.caucase-setup:setup}
cloudooo ${slapos.test.cloudooo-setup:setup}
cloudooo ${slapos.test.cloudooo-setup:setup}
dream ${slapos.test.dream-setup:setup}
dream ${slapos.test.dream-setup:setup}
gitlab ${slapos.test.gitlab-setup:setup}
gitlab ${slapos.test.gitlab-setup:setup}
htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
jscrawler ${slapos.test.jscrawler-setup:setup}
re6stnet ${slapos.test.re6stnet-setup:setup}
re6stnet ${slapos.test.re6stnet-setup:setup}
slapos-master ${slapos.test.slapos-master-setup:setup}
slapos-master ${slapos.test.slapos-master-setup:setup}
slaprunner ${slapos.test.slaprunner-setup:setup}
slaprunner ${slapos.test.slaprunner-setup:setup}
...
...
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