software/jscrawler: port to python3

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

@@ -24,6 +24,7 @@ extra =
   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

@@ -370,7 +370,6 @@ extra =
   cloudooo ${slapos.test.cloudooo-setup:setup}
   dream ${slapos.test.dream-setup:setup}
   gitlab ${slapos.test.gitlab-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}