1. 17 Nov, 2016 3 commits
    • Kirill Smelkov's avatar
      Revert "software/neoppod & stack/erp5: Hook in zodbutils" · 7f6729de
      Kirill Smelkov authored
      This reverts commit ae808179.
      
      Reason for revert: zodbtools depend on ZODB while currently neoppod &
      erp5 are depending on `ZODB3 = 3.10` so upon installing both ZODB3 and
      ZODB are installed. Together with our requirement
      
          stack/erp5/zope-versions.cfg:transaction = 1.1.1
      
      This creates version conflict and installation fails:
      
      2016-11-17 14:56:35,858 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO The version, 1.1.1, is not consistent with the requirement, 'transaction>=1.6.1'.
      2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO While:
      2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO   Installing neoppod.
      2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO Error: Bad version 1.1.1
      
      So revert zodbtools hooking for now until we upgrade our ZODB to ZODB > 3.
      7f6729de
    • Julien Muchembled's avatar
      typo · 554cb250
      Julien Muchembled authored
      554cb250
    • Kirill Smelkov's avatar
      software/neoppod & stack/erp5: Hook in zodbutils · ae808179
      Kirill Smelkov authored
      As advised by @Tyagov this adds zodbutils egg [1,2] to our software
      stack: both NEO and ERP5 (since stack/erp5/ inherits from
      neoppod/software-common.cfg)
      
      I have not build-tested this patch but I hope it should be ok.
      
      /cc @nexedi
      
      [1] https://lab.nexedi.com/nexedi/zodbtools  
      [2] https://pypi.python.org/pypi/zodbtools
      
      /reviewed-on nexedi/slapos!116
      ae808179
  2. 15 Nov, 2016 4 commits
  3. 11 Nov, 2016 1 commit
  4. 10 Nov, 2016 1 commit
  5. 09 Nov, 2016 1 commit
  6. 08 Nov, 2016 2 commits
  7. 07 Nov, 2016 6 commits
  8. 05 Nov, 2016 1 commit
    • Julien Muchembled's avatar
      build-rina: fix build of hellorina SR in test-rina · 48ff2c7f
      Julien Muchembled authored
      While:
        Installing lxml-python.
      
      An internal error occurred due to a bug in either zc.buildout or in a
      recipe being used:
      Traceback (most recent call last):
        File "/mnt/buildout/eggs/zc.buildout-2.5.2+slapos005-py2.7.egg/zc/buildout/buildout.py", line 2211, in main
          getattr(buildout, command)(args)
        File "/mnt/buildout/eggs/zc.buildout-2.5.2+slapos005-py2.7.egg/zc/buildout/buildout.py", line 637, in install
          self._install_parts(install_args)
        File "/mnt/buildout/eggs/zc.buildout-2.5.2+slapos005-py2.7.egg/zc/buildout/buildout.py", line 806, in _install_parts
          installed_files = self[part]._call(recipe.install)
        File "/mnt/buildout/eggs/zc.buildout-2.5.2+slapos005-py2.7.egg/zc/buildout/buildout.py", line 1579, in _call
          return f()
        File "/home/slapos/software/eggs/zc.recipe.egg-1.3.2.post5-py2.7.egg/zc/recipe/egg/custom.py", line 49, in install
          return self._install()
        File "/home/slapos/software/eggs/zc.recipe.egg-1.3.2.post5-py2.7.egg/zc/recipe/egg/custom.py", line 161, in _install
          newest=self.newest, patch_dict=patch_dict)
        File "/mnt/buildout/eggs/zc.buildout-2.5.2+slapos005-py2.7.egg/zc/buildout/easy_install.py", line 1061, in build
          assert executable == sys.executable, (executable, sys.executable)
      AssertionError: ('/home/slapos/software/parts/python2.7/bin/python2.7', '/usr/bin/python')
      48ff2c7f
  9. 04 Nov, 2016 3 commits
  10. 03 Nov, 2016 8 commits
  11. 02 Nov, 2016 5 commits
  12. 31 Oct, 2016 1 commit
  13. 30 Oct, 2016 2 commits
  14. 29 Oct, 2016 2 commits