Use python3 for caucase, jscrawler and htmlvalidatorserver softwares

See merge request nexedi/slapos!1243

software/caucase/software.cfg

@@ -7,8 +7,6 @@ parts +=
   instance
   caucase-eggs
 
-[python]
-part = python2.7
 
 [instance-caucased]
 recipe = slapos.recipe.build:download

software/caucase/test/test.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from __future__ import unicode_literals
+
 
 import json
 import os

software/htmlvalidatorserver/software.cfg

@@ -15,9 +15,6 @@ parts =
   slapos-cookbook
   template
 
-[python]
-part = python2.7
-
 ##########################################################
 # Service startup scripts and configuration files
 ##########################################################

software/jscrawler/software.cfg

@@ -16,9 +16,6 @@ parts =
   jscrawler-build
   instance
 
-[python]
-part = python2.7
-
 [nodejs]
 <= nodejs-12.18.3
 

software/jscrawler/test/test.py

@@ -26,8 +26,7 @@
 ##############################################################################
 
 import os
-import logging
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 import requests
 import time
@@ -51,7 +50,7 @@ class TestJSCrawler(SlapOSInstanceTestCase):
         self.send_response(200)
         self.send_header("Content-Type", "application/html")
         self.end_headers()
-        self.wfile.write('<title>Hello {}</title>'.format(self._name))
+        self.wfile.write(f'<title>Hello {self._name}</title>'.encode())
 
     return {
       'urls': '\n'.join([

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

@@ -14,6 +14,7 @@ extra-eggs +=
 extra =
 # The following list is for SR whose buildout runs only with Python 3.
   caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
+  caucase ${slapos.test.caucase-setup:setup}
   erp5testnode ${slapos.test.erp5testnode-setup:setup}
   galene ${slapos.test.galene-setup:setup}
   grafana ${slapos.test.grafana-setup:setup}
@@ -21,7 +22,9 @@ extra =
   helloworld ${slapos.test.helloworld-setup:setup}
   html5as ${slapos.test.html5as-setup:setup}
   html5as-base ${slapos.test.html5as-base-setup:setup}
+  htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
   hugo ${slapos.test.hugo-setup:setup}
+  jscrawler ${slapos.test.jscrawler-setup:setup}
   jstestnode ${slapos.test.jstestnode-setup:setup}
   jupyter ${slapos.test.jupyter-setup:setup}
   kvm ${slapos.test.kvm-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -367,12 +367,9 @@ extra =
 #          You should not add more lines here.
   backupserver ${slapos.test.backupserver-setup:setup}
   beremiz-ide ${slapos.test.beremiz-ide-setup:setup}
-  caucase ${slapos.test.caucase-setup:setup}
   cloudooo ${slapos.test.cloudooo-setup:setup}
   dream ${slapos.test.dream-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}
   slapos-master ${slapos.test.slapos-master-setup:setup}
   slaprunner ${slapos.test.slaprunner-setup:setup}