python3: default to python3.9 instead of python3.8

component/python3/buildout.cfg

@@ -18,7 +18,7 @@ parts =
     python3
 
 [python3]
-<= python3.8
+<= python3.9
 
 [python3-common]
 recipe = slapos.recipe.cmmi

component/xorg/buildout.cfg

@@ -97,8 +97,8 @@ environment =
 [xcbproto]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
-md5sum = abe9aa4886138150bbc04ae4f29b90e3
+url = https://xcb.freedesktop.org/dist/xcb-proto-1.15.1.tar.gz
+md5sum = 3ee98337cda244996fab03df47e09df8
 environment =
   PATH=${libxml2:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}

software/jstestnode/software.cfg

@@ -126,6 +126,3 @@ output = ${buildout:directory}/template-nginx.cfg.in
 [template-runTestSuite]
 <= macro-template
 output = ${buildout:directory}/runTestSuite.in
-
-[versions]
-selenium = 3.141.0

software/seleniumserver/software.cfg

@@ -28,10 +28,10 @@ recipe = zc.recipe.egg
 
 [selenium-server]
 recipe = slapos.recipe.build:download
-version = 3.14.0
-md5sum = 376450bd517510442b60018646deadfe
-filename = selenium-server-standalone-${:version}.jar
-url = https://selenium-release.storage.googleapis.com/3.14/${:filename}
+version = 4.5.3
+md5sum = be53a7c5a19bf613a75a75b4892dd116
+filename = selenium-server-${:version}.jar
+url = https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.5.0/${:filename}
 
 [macro-template]
 recipe = slapos.recipe.template

software/slapos-sr-testing/software.cfg

@@ -431,7 +431,6 @@ image = 1.5.25
 plantuml = 0.3.0:whl
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
-selenium = 3.141.0
 testfixtures = 6.11.0
 mysqlclient = 2.1.1
 pexpect = 4.8.0

stack/slapos.cfg

@@ -136,18 +136,20 @@ zc.buildout = 2.7.1+slapos019
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 
-traitlets = 4.3.3
-Jinja2 = 2.11.3
-Importing = 1.10
-MarkupSafe = 2.0.1
-PyYAML = 5.4.1
-Werkzeug = 2.0.2
-ZConfig = 2.9.3
+apache-libcloud = 2.4.0
 asn1crypto = 1.3.0
+async-generator = 1.10
 atomicwrites = 1.4.0
+atomize = 0.2.0
+attrs = 22.1.0
 backports.functools-lru-cache = 1.6.1:whl
 backports.lzma = 0.0.14
-cffi = 1.14.0
+bcrypt = 3.1.4
+CacheControl = 0.12.6:whl
+certifi = 2022.6.15
+cffi = 1.15.0
+chardet = 3.0.4
+charset-normalizer = 2.1.1
 click = 8.1.3
 cliff = 2.8.3:whl
 cmd2 = 0.7.0
@@ -155,44 +157,84 @@ collective.recipe.shelloutput = 0.1
 collective.recipe.template = 2.0
 configparser = 4.0.2:whl
 contextlib2 = 0.6.0.post1
+croniter = 0.3.25
 cryptography = 3.3.2
+dataclasses = 0.8
 dateparser = 0.7.6
 decorator = 4.3.0
+distro = 1.7.0
+dnspython = 1.16.0
+enum34 = 1.1.10
+erp5.util = 0.4.74
+# need wheel because there is no setup.py
+# (see https://erp5js.nexedi.net/#/bug_module/20221102-1C1B293)
+exceptiongroup = 1.0.0:whl
+feedparser = 6.0.10
+Flask = 1.1.2
 funcsigs = 1.0.2
+functools32 = 3.2.3.post2
 gevent = 20.9.0
 geventmp = 0.0.1
+gitdb2 = 2.0.5
+GitPython = 2.1.11
 greenlet = 0.4.17
+h11 = 0.14.0
 idna = 2.9
 igmp = 1.0.4
+Importing = 1.10
 importlib-metadata = 1.7.0:whl
 inotify-simple = 1.1.1
+ipaddress = 1.0.23
 itsdangerous = 0.24
+Jinja2 = 2.11.3
+jsonschema = 3.0.2:whl
+lockfile = 0.12.2:whl
 lock-file = 2.0
 lxml = 4.9.1
+MarkupSafe = 2.0.1
 meld3 = 1.0.2
 mock = 3.0.5
 more-itertools = 5.0.0
+msgpack = 0.6.2
 netaddr = 0.7.19
+netifaces = 0.10.7
+outcome = 1.2.0
+packaging = 16.8
+paramiko = 2.11.0
+passlib = 1.7.1
 pathlib2 = 2.3.5
-pbr = 2.0.0
+pbr = 5.9.0
 pim-dm = 1.4.0nxd001
+pkgconfig = 1.5.1
 plone.recipe.command = 1.1
+pluggy = 0.13.1:whl
 prettytable = 0.7.2
 psutil = 5.8.0
-pluggy = 0.13.1:whl
 py = 1.11.0:whl
+pyasn1 = 0.4.5
+pycparser = 2.20
+pycurl = 7.43.0
+py-mld = 1.0.3
+PyNaCl = 1.3.0
 pyOpenSSL = 19.1.0
 pyparsing = 3.0.9:whl
-py-mld = 1.0.3
 pyroute2 = 0.6.9
+pyrsistent = 0.18.1
+PyRSS2Gen = 1.1
+PySocks = 1.7.1
+pytest-runner = 5.2:whl
+python-dateutil = 2.8.2:whl
 pytz = 2022.2.1
+PyYAML = 5.4.1
 regex = 2020.9.27
 requests = 2.28.1
-charset-normalizer = 2.1.1
+rpdb = 0.1.5
+rubygemsrecipe  = 0.4.3
 scandir = 1.10.0
+selenium = 4.5.0:whl
 setproctitle = 1.1.10
 setuptools-dso = 1.7
-rubygemsrecipe  = 0.4.3
+sgmllib3k = 1.0.0
 six = 1.16.0
 slapos.cookbook = 1.0.291
 slapos.core = 1.8.4
@@ -203,70 +245,43 @@ slapos.recipe.build = 0.56
 slapos.recipe.cmmi = 0.19
 slapos.recipe.template = 5.0
 slapos.toolbox = 0.128
+smmap2 = 2.0.5
+sniffio = 1.3.0
+sortedcontainers = 2.4.0
 stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
+supervisor = 4.1.0
+traitlets = 4.3.3
+trio = 0.22.0
+trio-websocket = 0.9.2
+tzlocal = 1.5.1
 unicodecsv = 0.14.1
+uritemplate = 3.0.0
+urllib3 = 1.26.12
 wcwidth = 0.2.5
+Werkzeug = 2.0.2
 wheel = 0.35.1:whl
+wsproto = 1.2.0
 xml-marshaller = 1.0.2
 zc.lockfile = 1.4
+ZConfig = 2.9.3
 zdaemon = 4.2.0
 zipp = 1.2.0:whl
 zodburi = 2.5.0
 zope.event = 3.5.2
-paramiko = 2.11.0
-PyNaCl = 1.3.0
-bcrypt = 3.1.4
-CacheControl = 0.12.6:whl
-msgpack = 0.6.2
-Flask = 1.1.2
-GitPython = 2.1.11
-gitdb2 = 2.0.5
-smmap2 = 2.0.5
-PyRSS2Gen = 1.1
-apache-libcloud = 2.4.0
-atomize = 0.2.0
-croniter = 0.3.25
-dnspython = 1.16.0
-enum34 = 1.1.10
-erp5.util = 0.4.74
-feedparser = 5.2.1
-functools32 = 3.2.3.post2
-attrs = 22.1.0
-pyrsistent = 0.18.1
-pytest-runner = 5.2:whl
-ipaddress = 1.0.23
-jsonschema = 3.0.2:whl
-lockfile = 0.12.2:whl
-netifaces = 0.10.7
-packaging = 16.8
-passlib = 1.7.1
-pyasn1 = 0.4.5
-pycparser = 2.20
-pycurl = 7.43.0
-python-dateutil = 2.7.3:whl
-rpdb = 0.1.5
-supervisor = 4.1.0
-tzlocal = 1.5.1
-uritemplate = 3.0.0
 zope.interface = 5.4.0
-certifi = 2022.6.15
-chardet = 3.0.4
-urllib3 = 1.26.12
-pkgconfig = 1.5.1
-distro = 1.7.0
-
 
 [versions:python2]
 attrs = 18.2.0
+certifi = 2020.4.5.1
+charset-normalizer = 2.0.12
 click = 6.7
 distro = 1.6.0
-Werkzeug = 1.0.1
-requests = 2.27.1
-charset-normalizer = 2.0.12
+feedparser = 5.2.1
 pyparsing = 2.2.0
-certifi = 2020.4.5.1
 pyrsistent = 0.16.1
+requests = 2.27.1
+Werkzeug = 1.0.1
 
 [versions:sys.version_info < (3,8)]
 MarkupSafe = 1.0