Merge remote-tracking branch 'upstream/master' into zope4py2

component/cython/buildout.cfg

@@ -6,4 +6,4 @@ recipe = zc.recipe.egg:custom
 egg = cython
 
 [versions]
-Cython = 0.29.21
+cython = 0.29.24

component/macros/macro.pythonpath.eggs.cfg

+[buildout]
+parts =
+
+[macro.pythonpath.eggs]
+recipe = slapos.recipe.build
+_name_ = ${:_buildout_section_name_}
+init =
+  prerequisite = """
+  [.%(_name_)s.prerequisite]
+  recipe = slapos.recipe.build
+  init =
+    section = self.buildout['%(_name_)s']
+    self.eggs = [e.strip() for e in section['eggs'].splitlines() if e.strip()]
+  update =
+    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['%(environment)s']['PYTHONPATH'] = paths
+    print("PYTHONPATH=" + paths)
+  """ % options
+  self.buildout.parse(prerequisite)

component/matplotlib/buildout.cfg

@@ -36,3 +36,10 @@ rpath =
   ${libpng:location}/lib
   ${freetype:location}/lib
 need-matplotlibrc = ${matplotlibrc:location}
+
+[versions]
+matplotlib = 2.1.2
+cycler = 0.11.0
+
+[versions:sys.version_info < (3,8)]
+cycler = 0.10.0

component/numpy/buildout.cfg

 [buildout]
+extends =
+  ../cython/buildout.cfg
+  ../macros/macro.pythonpath.eggs.cfg
 parts = numpy
 
+[numpy-env]
+BLAS=None
+LAPACK=None
+ATLAS=None
+
 [numpy]
 recipe = zc.recipe.egg:custom
 egg = numpy
+environment = numpy-env
+depends = ${numpy-pythonpath:recipe}
 
+[numpy-pythonpath]
+<= macro.pythonpath.eggs
+environment = numpy-env
+eggs = ${cython:egg}
 
 [versions]
+numpy = 1.22.0
+
+[numpy:sys.version_info < (3,8)]
+depends =
+
+[versions:sys.version_info < (3,8)]
 numpy = 1.16.4

component/numpy/openblas.cfg

@@ -2,6 +2,7 @@
 extends =
   buildout.cfg
   ../openblas/buildout.cfg
+parts = numpy
 
 [numpy-env]
 OPENBLAS = ${openblas:location}/lib/libopenblas.so
@@ -10,5 +11,4 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
 
 [numpy]
 environment = numpy-env
-rpath =
-  ${openblas:location}/lib
+rpath = ${openblas:location}/lib

component/pandas/buildout.cfg

 [buildout]
 extends =
+  ../cython/buildout.cfg
   ../numpy/buildout.cfg
 
 parts =
@@ -12,4 +13,15 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = pandas
 environment = pandas-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+
+[pandas:sys.version_info >= (3,8)]
+setup-eggs +=
+  ${cython:egg}
+
+[versions]
+pandas = 0.25.3
+
+[versions:sys.version_info >= (3,8)]
+pandas = 1.4.0

component/scipy/buildout.cfg

 [buildout]
+# Scipy requires BLAS/LAPACK libraries.
 extends =
   ../numpy/openblas.cfg
-
-parts =
-  scipy
+  ../pandas/buildout.cfg
+parts = scipy
 
 [scipy-env]
 <= numpy-env
@@ -14,3 +14,31 @@ egg = scipy
 environment = scipy-env
 setup-eggs = ${numpy:egg}
 rpath = ${numpy:rpath}
+depends = ${scipy-pythonpath:recipe}
+
+[scipy-pythonpath]
+<= macro.pythonpath.eggs
+environment = scipy-env
+eggs = ${scipy-setup-eggs:eggs}
+
+[scipy-setup-eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${cython:egg}
+  ${numpy:egg}
+  ${pandas:egg}
+  pythran
+  pybind11
+
+[versions]
+pybind11 = 2.9.2
+scipy = 1.8.1
+beniget = 0.4.1
+gast = 0.5.3
+pythran = 0.11.0:whl
+
+[scipy:sys.version_info < (3,8)]
+depends =
+
+[versions:sys.version_info < (3,8)]
+scipy = 1.0.1

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.291'
+version = '1.0.297'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 
@@ -131,6 +131,8 @@ setup(name=name,
           'publish-early = slapos.recipe.publish_early:Recipe',
           'publishsection = slapos.recipe.publish:PublishSection',
           'publishurl = slapos.recipe.publishurl:Recipe',
+          'publish_failsafe = slapos.recipe.publish:RecipeFailsafe',
+          'publish.serialised_failsafe = slapos.recipe.publish:SerialisedFailsafe',
           'random.time = slapos.recipe.random:Time',
           'random.integer = slapos.recipe.random:Integer',
           'readline = slapos.recipe.readline:Recipe',

slapos/recipe/publish.py

@@ -29,10 +29,12 @@ import zc.buildout
 from slapos.recipe.librecipe import wrap
 from slapos.recipe.librecipe import GenericSlapRecipe
 import six
+import os
 
 CONNECTION_PARAMETER_STRING = 'connection-'
 
 class Recipe(GenericSlapRecipe):
+  return_list = []
   def __init__(self, buildout, name, options):
     super(Recipe, self).__init__(buildout, name, options)
     # Tell buildout about the sections we will access during install.
@@ -55,7 +57,7 @@ class Recipe(GenericSlapRecipe):
       for k in publish:
         publish_dict[k] = section[k]
     self._setConnectionDict(publish_dict, self.options.get('-slave-reference'))
-    return []
+    return self.return_list
 
   def _setConnectionDict(self, publish_dict, slave_reference=None):
     return self.setConnectionDict(publish_dict, slave_reference)
@@ -65,6 +67,32 @@ class Serialised(Recipe):
     return super(Serialised, self)._setConnectionDict(wrap(publish_dict), slave_reference)
 
 
+class Failsafe(object):
+  def _setConnectionDict(self, publish_dict, slave_reference):
+    error_status_file = self.options.get('-error-status-file')
+    if error_status_file:
+      self.return_list = [error_status_file]
+    else:
+      self.return_list = []
+    try:
+      super(Failsafe, self)._setConnectionDict(publish_dict, slave_reference)
+    except Exception:
+      if error_status_file is not None:
+        with open(error_status_file, 'w') as fh:
+          fh.write('')
+    else:
+      if error_status_file is not None:
+        if os.path.exists(error_status_file):
+          os.unlink(error_status_file)
+
+
+class RecipeFailsafe(Failsafe, Recipe):
+  pass
+
+
+class SerialisedFailsafe(Failsafe, Serialised):
+  pass
+
 
 class PublishSection(GenericSlapRecipe):
   """

stack/erp5/buildout.cfg

@@ -835,7 +835,6 @@ nt-svcutils = 2.13.0
 oauth2client = 4.0.0
 oauthlib = 3.1.0
 objgraph = 3.1.0
-ply = 3.10
 polib = 1.0.8
 pprofile = 2.0.4
 pyasn1-modules = 0.0.8

stack/slapos.cfg

@@ -201,6 +201,7 @@ pim-dm = 1.4.0nxd001
 pkgconfig = 1.5.1
 plone.recipe.command = 1.1
 pluggy = 0.13.1:whl
+ply = 3.11
 prettytable = 0.7.2
 psutil = 5.8.0
 py = 1.11.0:whl
@@ -215,7 +216,7 @@ pyroute2 = 0.6.9
 pyrsistent = 0.18.1
 PyRSS2Gen = 1.1
 pytest-runner = 5.2:whl
-python-dateutil = 2.7.3:whl
+python-dateutil = 2.8.2:whl
 pytz = 2022.2.1
 PyYAML = 5.4.1
 regex = 2020.9.27
@@ -227,7 +228,7 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 six = 1.16.0
 slapos.cookbook = 1.0.291
-slapos.core = 1.8.4
+slapos.core = 1.8.5
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5