From 6d1cd657905328e8124a40ce7b09e2c905eac238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Tue, 14 Apr 2020 19:05:54 +0200 Subject: [PATCH] Update buildout.cfg and travis.cfg --- buildout.cfg | 66 ++++++++++++++++++++++------------------------------ travis.cfg | 4 ++++ 2 files changed, 32 insertions(+), 38 deletions(-) diff --git a/buildout.cfg b/buildout.cfg index d915621e..33747840 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,13 +1,4 @@ [buildout] -parts = - lxml - instance - test - omelette - i18ndude - update_translations - write_code_headers - extends = http://dist.plone.org/release/4.3.19/versions.cfg @@ -17,15 +8,21 @@ find-links = http://dist.plone.org/release/4.3.19 http://dist.plone.org/thirdparty -eggs = - Plone - Pillow +parts = + instance + i18ndude + update_translations + write_code_headers lxml - plone.reload + test + omelette + +eggs = senaite.lims senaite.panic + plone.reload i18ndude - Products.PrintingMailHost + lxml zcml = @@ -44,46 +41,23 @@ develop = . senaite.api = git git://github.com/senaite/senaite.api.git pushurl=git@github.com:senaite/senaite.api.git branch=master senaite.core = git git://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=master senaite.core.listing = git git://github.com/senaite/senaite.core.listing.git pushurl=git@github.com:senaite/senaite.core.listing.git branch=master +senaite.core.spotlight = git git://github.com/senaite/senaite.core.spotlight.git pushurl=git@github.com:senaite/senaite.core.spotlight.git branch=master senaite.core.supermodel = git git://github.com/senaite/senaite.core.supermodel.git pushurl=git@github.com:senaite/senaite.core.supermodel.git branch=master senaite.impress = git git://github.com/senaite/senaite.impress.git pushurl=git@github.com:senaite/senaite.impress.git branch=master senaite.lims = git git://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=master senaite.panic = git git://github.com/senaite/senaite.panic.git pushurl=git@github.com:senaite/senaite.panic.git branch=master -[lxml] -recipe = z3c.recipe.staticlxml -egg = lxml==4.2.1 -force = false -static-build = true - [instance] recipe = plone.recipe.zope2instance user = admin:admin http-address = 127.0.0.1:8080 eggs = - senaite.health ${buildout:eggs} zcml = - senaite.health ${buildout:zcml} environment-vars = zope_i18n_compile_mo_files true -[lxml] -recipe = z3c.recipe.staticlxml -egg = lxml==4.2.1 -force = false -static-build = true - -[test] -recipe = zc.recipe.testrunner -eggs = - senaite.health [test] -defaults = ['--auto-color', '--auto-progress'] - -[omelette] -recipe = collective.recipe.omelette -eggs = ${buildout:eggs} - [i18ndude] unzip = true recipe = zc.recipe.egg @@ -101,6 +75,22 @@ output = ${buildout:directory}/bin/write_code_headers input = ${buildout:directory}/templates/write_code_headers.py.in mode = 755 +[lxml] +recipe = z3c.recipe.staticlxml +egg = lxml==4.2.1 +force = false +static-build = true + +[test] +recipe = zc.recipe.testrunner +defaults = ['--auto-color', '--auto-progress'] +eggs = + senaite.health [test] + +[omelette] +recipe = collective.recipe.omelette +eggs = ${buildout:eggs} + [versions] setuptools = zc.buildout = diff --git a/travis.cfg b/travis.cfg index 4dff4f29..c83ebd90 100644 --- a/travis.cfg +++ b/travis.cfg @@ -2,6 +2,10 @@ extends = buildout.cfg +parts = + instance + test + eggs = senaite.core senaite.health