Commit 80fbcbad authored by Thomas Gambier's avatar Thomas Gambier

Release version 1.8.0

parent eeaff0dd
Pipeline #23248 failed with stage
in 0 seconds
Changes Changes
======= =======
1.8.0 (2022-09-01)
------------------
* slapos.cfg: add lab.nxdcdn.com endpoint
1.7.13 (2022-07-28) 1.7.13 (2022-07-28)
------------------- -------------------
* format: add more information in os_type * format: add more information in os_type
......
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
# #
############################################################################## ##############################################################################
version = '1.7.13' version = '1.8.0'
  • @tomo it seems there was a mistake while uploading this release. This new version introduced failures in theia integration suite ( https://erp5js.nexedi.net/#/test_result_module/20220905-1D60B8341/35 ):

    Traceback (most recent call last):
      File "/srv/slapgrid/slappart14/t/cvr/i/0/tmp/soft/e3c74066e253d1e9aebda838da20e101/eggs/slapos.core-1.8.0-py3.8.egg/slapos/grid/slapgrid.py", line 629, in processSoftwareReleaseList
        software.install()
      File "/srv/slapgrid/slappart14/t/cvr/i/0/tmp/soft/e3c74066e253d1e9aebda838da20e101/eggs/slapos.core-1.8.0-py3.8.egg/slapos/grid/SlapObject.py", line 212, in install
        self._install_from_buildout()
      File "/srv/slapgrid/slappart14/t/cvr/i/0/tmp/soft/e3c74066e253d1e9aebda838da20e101/eggs/slapos.core-1.8.0-py3.8.egg/slapos/grid/SlapObject.py", line 294, in _install_from_buildout
        utils.launchBuildout(path=self.software_path,
      File "/srv/slapgrid/slappart14/t/cvr/i/0/tmp/soft/e3c74066e253d1e9aebda838da20e101/eggs/slapos.core-1.8.0-py3.8.egg/slapos/grid/utils.py", line 371, in launchBuildout
        with open(buildout_binary, 'r') as f:
    TypeError: expected str, bytes or os.PathLike object, not NoneType

    If I rebuild locally, and compare with the .tar.gz from pypi, I have the following diff:

    diff '--color=auto' -ru slapos.core-1.8.0-rebuild/PKG-INFO slapos.core-1.8.0-on-pypi/PKG-INFO
    --- slapos.core-1.8.0-rebuild/PKG-INFO	2022-09-06 13:24:17.000000000 +0900
    +++ slapos.core-1.8.0-on-pypi/PKG-INFO	2022-09-02 04:49:31.185852000 +0900
    @@ -1523,7 +1523,7 @@
     Keywords: slapos core
     Platform: UNKNOWN
     Classifier: Programming Language :: Python
    -Provides-Extra: test
    -Provides-Extra: ipython_console
    -Provides-Extra: docs
     Provides-Extra: bpython_console
    +Provides-Extra: docs
    +Provides-Extra: ipython_console
    +Provides-Extra: test
    diff '--color=auto' -ru slapos.core-1.8.0-rebuild/slapos/grid/SlapObject.py slapos.core-1.8.0-on-pypi/slapos/grid/SlapObject.py
    --- slapos.core-1.8.0-rebuild/slapos/grid/SlapObject.py	2022-09-06 13:24:17.000000000 +0900
    +++ slapos.core-1.8.0-on-pypi/slapos/grid/SlapObject.py	2022-08-30 18:38:12.000000000 +0900
    @@ -289,27 +289,13 @@
           additional_parameters.extend(['-c', buildout_cfg])
     
           buildout_binary = os.path.join(self.software_path, 'bin', 'buildout')
    -      buildout_marker = buildout_binary + "-bootstrap-skipped"
    -
    -      try:
    -        os.remove(buildout_marker)
    -      except OSError as e:
    -        if e.errno != errno.ENOENT:
    -          raise
    -        if os.path.exists(buildout_binary):
    -          f = open(buildout_marker, "w")
    -      if f is None:
    -        utils.bootstrapBuildout(path=self.software_path,
    -                                buildout=self.buildout,
    -                                logger=self.logger,
    -                                additional_buildout_parameter_list=additional_parameters)
    +      if not os.path.exists(buildout_binary):
    +        buildout_binary = self.buildout
           utils.launchBuildout(path=self.software_path,
                                buildout_binary=buildout_binary,
                                logger=self.logger,
                                additional_buildout_parameter_list=additional_parameters,
                                debug=self.buildout_debug)
    -      if f is not None:
    -        os.remove(buildout_marker)
         finally:
           shutil.rmtree(extends_cache)
           if f is not None:
    diff '--color=auto' -ru slapos.core-1.8.0-rebuild/slapos/grid/utils.py slapos.core-1.8.0-on-pypi/slapos/grid/utils.py
    --- slapos.core-1.8.0-rebuild/slapos/grid/utils.py	2022-09-06 13:24:17.000000000 +0900
    +++ slapos.core-1.8.0-on-pypi/slapos/grid/utils.py	2022-08-30 18:43:29.000000000 +0900
    @@ -362,6 +362,7 @@
       """ Launches buildout."""
       if additional_buildout_parameter_list is None:
         additional_buildout_parameter_list = []
    +  logger.warn('Using buildout binary %s' % buildout_binary)
       # Reads uid/gid of path, launches buildout with thoses privileges
       stat_info = os.stat(path)
       uid = stat_info.st_uid
    diff '--color=auto' -ru slapos.core-1.8.0-rebuild/slapos.core.egg-info/PKG-INFO slapos.core-1.8.0-on-pypi/slapos.core.egg-info/PKG-INFO
    --- slapos.core-1.8.0-rebuild/slapos.core.egg-info/PKG-INFO	2022-09-06 13:24:17.000000000 +0900
    +++ slapos.core-1.8.0-on-pypi/slapos.core.egg-info/PKG-INFO	2022-09-02 04:49:30.000000000 +0900
    @@ -1523,7 +1523,7 @@
     Keywords: slapos core
     Platform: UNKNOWN
     Classifier: Programming Language :: Python
    -Provides-Extra: test
    -Provides-Extra: ipython_console
    -Provides-Extra: docs
     Provides-Extra: bpython_console
    +Provides-Extra: docs
    +Provides-Extra: ipython_console
    +Provides-Extra: test
    diff '--color=auto' -ru slapos.core-1.8.0-rebuild/slapos.core.egg-info/requires.txt slapos.core-1.8.0-on-pypi/slapos.core.egg-info/requires.txt
    --- slapos.core-1.8.0-rebuild/slapos.core.egg-info/requires.txt	2022-09-06 13:24:17.000000000 +0900
    +++ slapos.core-1.8.0-on-pypi/slapos.core.egg-info/requires.txt	2022-09-02 04:49:30.000000000 +0900
    @@ -1,27 +1,27 @@
     Flask>=1.1.2
    +PyYAML
    +cachecontrol
    +cliff
    +distro
    +jsonschema
    +lockfile
     lxml
     netaddr>=0.7.5
     netifaces
    -setuptools
    -supervisor
     psutil>=2.0.0
    -xml_marshaller>=0.9.3
    -zope.interface
    -zc.buildout
    -cliff
     requests>=2.4.3
    +setuptools
     six
    -cachecontrol
    -lockfile
    -jsonschema
    -PyYAML
    +supervisor
     uritemplate
    -distro
    +xml_marshaller>=0.9.3
    +zc.buildout
    +zope.interface
     
     [:python_version < "3"]
    -subprocess32
     enum34
     ipaddress
    +subprocess32
     
     [bpython_console]
     bpython
    @@ -35,6 +35,6 @@
     ipython
     
     [test]
    -pyflakes
    -mock
     httmock
    +mock
    +pyflakes

    I rebuild and upload 1.8.1 to fix this

Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment