Version up zc.buildout 3.0.1+slapos004 and scipy 1.12.0

See merge request nexedi/slapos!1602

component/macros/macro.pythonpath.eggs.cfg

 [buildout]
 parts =
 
-[macro.pythonpath.eggs]
+[macro.variable.eggs]
 recipe = slapos.recipe.build
 init =
   self.eggs = [e.strip() for e in options['eggs'].splitlines() if e.strip()]
 update =
+  import os
   from zc.buildout.easy_install import working_set
   buildout = self.buildout['buildout']
   eggs_directory = buildout['eggs-directory']
   develop_eggs_directory = buildout['develop-eggs-directory']
   dists = working_set(self.eggs, [develop_eggs_directory, eggs_directory])
-  paths = ':'.join(dist.location for dist in dists)
-  self.buildout[options['environment']]['PYTHONPATH'] = paths
-  print("PYTHONPATH=" + paths)
+  subpaths = dict(l.split() for l in options['subpaths'].splitlines())
+  def make_path(dist):
+    subpath = subpaths.get(dist.key)
+    return os.path.join(dist.location, subpath) if subpath else dist.location
+  paths = ':'.join(make_path(dist) for dist in dists)
+  environment = self.buildout[options['environment']]
+  variable = options['variable']
+  value = environment.get(variable)
+  if value:
+    paths = '%s:%s' % (paths, value)
+  environment[variable] = paths
+  print("%s=%s" %(variable, paths))
+variable = PYTHONPATH
+subpaths =
+
+[macro.pythonpath.eggs]
+<= macro.variable.eggs

component/scipy/buildout.cfg

 [buildout]
 # Scipy requires BLAS/LAPACK libraries.
 extends =
+  ../meson/buildout.cfg
+  ../ninja/buildout.cfg
   ../numpy/openblas.cfg
   ../pandas/buildout.cfg
+  ../pkgconfig/buildout.cfg
 parts = scipy
 
 [scipy-env]
 <= numpy-env
+PATH=${meson:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:%(PATH)s
+PKG_CONFIG_PATH = ${openblas:location}/lib/pkgconfig
 
 [scipy]
 recipe = zc.recipe.egg:custom
@@ -14,30 +19,51 @@ egg = scipy
 environment = scipy-env
 setup-eggs = ${numpy:egg}
 rpath = ${numpy:rpath}
-depends = ${scipy-pythonpath:recipe}
+depends =
+  ${scipy-pythonpath:recipe}
+  ${scipy-pkgconfig:recipe}
 
 [scipy-pythonpath]
 <= macro.pythonpath.eggs
 environment = scipy-env
 eggs = ${scipy-setup-eggs:eggs}
 
+[scipy-pkgconfig]
+<= macro.variable.eggs
+variable = PKG_CONFIG_PATH
+environment = scipy-env
+eggs = pybind11
+subpaths =
+  pybind11 pybind11/share/pkgconfig/
+depends = ${scipy-setup-eggs:recipe}
+
 [scipy-setup-eggs]
 recipe = zc.recipe.egg
 scripts =
+  cython
+  pythran
 eggs =
   ${cython:egg}
   ${numpy:egg}
   ${pandas:egg}
+  meson-python
   pythran
   pybind11
 
 [versions]
-pybind11 = 2.9.2
-scipy = 1.8.1
+pybind11 = 2.11.1
+scipy = 1.12.0
+meson-python = 0.13.2:whl
+pyproject-metadata = 0.8.0:whl
+meson = 1.4.1
 beniget = 0.4.1
 gast = 0.5.3
 pythran = 0.11.0:whl
 
+[versions:sys.version_info < (3,11)]
+tomli = 2.0.1:whl
+
+
 [scipy:sys.version_info < (3,8)]
 depends =
 

component/wendelin.core/buildout.cfg

@@ -50,7 +50,7 @@ CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
 branch   = master
-revision = wendelin.core-2.0.alpha3-9-gda765ef
+revision = wendelin.core-2.0.alpha3-22-g07087ec8
 # dir is pretty name as top-level recipe
 location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

software/monitor/software.cfg

@@ -79,6 +79,7 @@ numpy = 1.22.0
 
 # For numy = 1.22.0
 setuptools = 44.1.1
+scipy = 1.11.4
 
 # Build GCC with Fortran for OpenBLAS (scipy & numpy)
 [gcc]

software/rapid-cdn/software.cfg

@@ -38,7 +38,6 @@ url = ${:_profile_base_location_}/software.py
 recipe = plone.recipe.command
 stop-on-error = True
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-update-command = ${:command}
 command =
   rm -fr ${:location} &&
   mkdir -p ${:location} &&

software/slapos-sr-testing/software.cfg

@@ -272,6 +272,11 @@ setup = ${slapos-repository:location}/software/js-drone/test/
 egg = slapos.test.osie_coupler
 setup = ${slapos-repository:location}/software/osie-coupler/test/
 
+[slapos.test.slapos-testing-setup]
+<= setup-develop-egg
+egg = slapos.test.slapos_testing
+setup = ${slapos-repository:location}/software/slapos-testing/test/
+
 [slapos.core-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.core.git
@@ -394,6 +399,7 @@ eggs +=
   ${slapos.test.restic_rest_server-setup:egg}
   ${slapos.test.seleniumserver-setup:egg}
   ${slapos.test.slapos-master-setup:egg}
+  ${slapos.test.slapos-testing-setup:egg}
   ${slapos.test.ssh-setup:egg}
   ${slapos.test.theia-setup:egg}
   ${slapos.test.turnserver-setup:egg}
@@ -490,6 +496,7 @@ tests =
   restic-rest-server ${slapos.test.restic_rest_server-setup:setup}
   seleniumserver ${slapos.test.seleniumserver-setup:setup}
   slapos-master ${slapos.test.slapos-master-setup:setup}
+  slapos-testing ${slapos.test.slapos-testing-setup:setup}
   ssh ${slapos.test.ssh-setup:setup}
   theia ${slapos.test.theia-setup:setup}
   turnserver ${slapos.test.turnserver-setup:setup}

software/slapos-testing/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.slapos_testing'
+
+description = "Test for SlapOS' slapos-testing"
+
+setup(
+    name=name,
+    version=version,
+    description=description,
+    long_description=description,
+    long_description_content_type='text/plain',
+    maintainer="Nexedi",
+    maintainer_email="info@nexedi.com",
+    url="https://lab.nexedi.com/nexedi/slapos",
+    packages=find_packages(),
+    install_requires=[
+        'slapos.core',
+        'slapos.libnetworkcache',
+    ],
+    zip_safe=True,
+    test_suite='test',
+)

software/slapos-testing/test/test.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+
+from slapos.testing.testcase import (
+    makeModuleSetUpAndTestCaseClass,
+    installSoftwareUrlList,
+  )
+
+parent_folder = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+
+software_files =  ['software%s.cfg' % v for v in ('', '-py3next', '-py2')]
+
+software_urls = [os.path.join(parent_folder, name) for name in software_files]
+
+_, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+  parent_folder + '/{' + '|'.join(software_files) + '}' # used only for display
+)
+
+def setUpModule():
+  # Supply every version of the software.
+  installSoftwareUrlList(
+    SlapOSInstanceTestCase,
+    software_urls,
+    debug=bool(int(os.environ.get('SLAPOS_TEST_DEBUG', 0))),
+  )
+
+class SlaposTestingTestCase(SlapOSInstanceTestCase):
+  def requestDefaultInstance(cls, state='started'):
+    # This method is called for requesting and destroying (state='destroyed').
+    for name, url in zip(software_files, software_urls):
+      cls.slap.request(
+        software_release=url,
+        software_type=None, # default
+        partition_reference='Instance_of_' + name,
+        partition_parameter_kw=cls._instance_parameter_dict,
+        state=state,
+      )
+
+  def test():
+    # Just test that each version of the software compiled and instantiates.
+    pass

software/theia/test/test_resiliency.py

@@ -499,8 +499,8 @@ class TakeoverMixin(ExportAndImportMixin):
     resp = requests.get("%s?password=%s" % (takeover_url, takeover_password), verify=True)
     self.assertEqual(requests.codes.ok, resp.status_code)
     # Allow KeyError because of stricter "slapos request" command
-    self.assertNotIn("Error", resp.text.replace("KeyError: \\'frozen\\'", ""), "An Error occured: %s" % resp.text)
-    self.assertIn("Success", resp.text, "An Error occured: %s" % resp.text)
+    self.assertNotIn("Error", resp.text.replace("KeyError: \\'frozen\\'", ""))
+    self.assertIn("Success", resp.text)
     return resp.text
 
   def _doTakeover(self):

stack/slapos.cfg

@@ -138,10 +138,10 @@ eggs =
 # The last version of setuptools compatible with Python 3.7
 setuptools = 67.8.0
 # Use SlapOS patched zc.buildout
-zc.buildout = 3.0.1+slapos002
+zc.buildout = 3.0.1+slapos004
 pip = 23.2.1
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
-zc.recipe.egg = 2.0.8.dev0+slapos002
+zc.recipe.egg = 2.0.8.dev0+slapos004
 
 aiofiles = 23.1.0:whl
 aiohttp = 3.8.5:whl