Merge branch 'add-python-version' of https://lab.nexedi.com/tleymone/slapos into zope4py2

component/ceph/buildout.cfg

@@ -35,6 +35,11 @@ recipe = slapos.recipe.build
 shared = true
 pyyaml = ${pyyaml-download:target}
 pyaml = ${pyaml-download:target}
+init =
+  # add the python executable in the options dict so that
+  # buildout signature changes if python executable changes
+  import sys
+  options['python-executable'] = sys.executable
 
 install =
   import os, sys

component/python3/buildout.cfg

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

component/selenium/buildout.cfg

+[buildout]
+parts =
+  selenium
+
+[selenium]
+recipe = zc.recipe.egg
+egg = selenium
+# patch to support python3.9
+selenium-patches = https://github.com/SeleniumHQ/selenium/commit/ddd163b681776292a72c39352581cf5c9d4f88f4.patch#c801fade1cd2019c063a0f0ef7cca3fe
+selenium-patch-options = -p2
+
+[versions]
+selenium = 3.141.0+SlapOSPatched001

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

@@ -13,6 +13,7 @@ extends =
   ../../component/nginx/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/curl/buildout.cfg
+  ../../component/selenium/buildout.cfg
   ./buildout.hash.cfg
 
 parts =
@@ -36,7 +37,7 @@ parts =
 recipe = zc.recipe.egg
 eggs =
   erp5.util
-  selenium
+  ${selenium:egg}
   certifi
   ${lxml-python:egg}
 interpreter = pythonwitheggs
@@ -126,6 +127,3 @@ output = ${buildout:directory}/template-nginx.cfg.in
 [template-runTestSuite]
 <= macro-template
 output = ${buildout:directory}/runTestSuite.in
-
-[versions]
-selenium = 3.141.0

software/slapos-sr-testing/software.cfg

@@ -13,6 +13,7 @@ extends =
   ../../component/python-mysqlclient/buildout.cfg
   ../../component/python-pynacl/buildout.cfg
   ../../component/python-backports-lzma/buildout.cfg
+  ../../component/selenium/buildout.cfg
 
   ../../stack/slapos.cfg
   ../../stack/nxdtest.cfg
@@ -292,6 +293,7 @@ eggs +=
   ${backports.lzma:egg}
   ${bcrypt:egg}
   ${psycopg2:egg}
+  ${selenium:egg}
   slapos.libnetworkcache
   supervisor
   ${slapos.cookbook-setup:egg}
@@ -438,7 +440,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/erp5/buildout.cfg

@@ -64,6 +64,7 @@ extends =
   ../../component/bcrypt/buildout.cfg
   ../../component/python-pynacl/buildout.cfg
   ../../component/python-xmlsec/buildout.cfg
+  ../../component/selenium/buildout.cfg
   ../../stack/caucase/buildout.cfg
   ../../software/neoppod/software-common.cfg
 # keep neoppod extends last
@@ -610,7 +611,7 @@ eggs = ${neoppod:eggs}
   pycountry
   xfw
   jsonschema
-  selenium
+  ${selenium:egg}
   pytesseract
   decorator
   networkx
@@ -852,7 +853,6 @@ uuid = 1.30
 validictory = 1.1.0
 xfw = 0.10
 xupdate-processor = 0.5
-selenium = 3.14.1
 scikit-image = 0.14.0
 PyWavelets = 0.5.2
 networkx = 2.1

stack/slapos.cfg

@@ -138,6 +138,7 @@ zc.recipe.egg = 2.0.3+slapos003
 
 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
@@ -146,7 +147,7 @@ backports.lzma = 0.0.14
 bcrypt = 3.1.4
 CacheControl = 0.12.6:whl
 certifi = 2022.6.15
-cffi = 1.14.0
+cffi = 1.15.0
 chardet = 3.0.4
 charset-normalizer = 2.1.1
 click = 8.1.3
@@ -158,13 +159,17 @@ 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
-feedparser = 5.2.1
+# 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
@@ -173,6 +178,7 @@ 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
@@ -192,11 +198,12 @@ 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
@@ -215,6 +222,7 @@ pyparsing = 3.0.9:whl
 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
@@ -226,6 +234,7 @@ rubygemsrecipe  = 0.4.3
 scandir = 1.10.0
 setproctitle = 1.1.10
 setuptools-dso = 1.7
+sgmllib3k = 1.0.0
 six = 1.16.0
 slapos.cookbook = 1.0.297
 slapos.core = 1.8.5
@@ -237,10 +246,14 @@ 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
@@ -248,6 +261,7 @@ 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
 # XXX Zope4 this ZConfig version seems misplaced (how about having it in ZODB ?)
@@ -265,6 +279,7 @@ certifi = 2020.4.5.1
 charset-normalizer = 2.0.12
 click = 6.7
 distro = 1.6.0
+feedparser = 5.2.1
 pyparsing = 2.2.0
 pyrsistent = 0.16.1
 requests = 2.27.1