From b2a1a108b6f5f21330120f0ac0b1c707d243f772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Sat, 15 Jun 2024 12:52:39 +0200 Subject: [PATCH] Compatibility with core#2567 --- buildout.cfg | 95 +------------------ .../storage/tests/doctests/PrimarySample.rst | 2 +- .../tests/doctests/StorageWorkflow.rst | 2 +- 3 files changed, 3 insertions(+), 96 deletions(-) diff --git a/buildout.cfg b/buildout.cfg index de7c42b..57b23ce 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,96 +1,3 @@ [buildout] -index = https://pypi.org/simple/ -extends = https://dist.plone.org/release/5.2-latest/versions.cfg -find-links = - https://dist.plone.org/release/5.2-latest/ - https://dist.plone.org/thirdparty/ - -parts = - instance - test - omelette - i18ndude - update_translations - write_code_headers - -eggs = - senaite.storage - senaite.core - senaite.app.listing - senaite.app.spotlight - senaite.app.supermodel - senaite.impress - senaite.jsonapi - senaite.lims - - plone.reload - Products.PrintingMailHost - -extensions = mr.developer - +extends = https://raw.githubusercontent.com/senaite/senaite.core/2.x/buildout.base.cfg package-name = senaite.storage - -versions = versions -show-picked-versions = true - -plone-user = admin:admin - -develop = . -sources = sources -auto-checkout = * - -[sources] -senaite.core = git https://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=2.x -senaite.app.listing = git https://github.com/senaite/senaite.app.listing.git pushurl=git@github.com:senaite/senaite.app.listing.git branch=2.x -senaite.app.spotlight = git https://github.com/senaite/senaite.app.spotlight.git pushurl=git@github.com:senaite/senaite.app.spotlight.git branch=2.x -senaite.app.supermodel = git https://github.com/senaite/senaite.app.supermodel.git pushurl=git@github.com:senaite/senaite.app.supermodel.git branch=2.x -senaite.impress = git https://github.com/senaite/senaite.impress.git pushurl=git@github.com:senaite/senaite.impress.git branch=2.x -senaite.jsonapi = git https://github.com/senaite/senaite.jsonapi.git pushurl=git@github.com:senaite/senaite.jsonapi.git branch=2.x -senaite.lims = git https://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=2.x - -[instance] -recipe = plone.recipe.zope2instance -http-address = 127.0.0.1:8080 -user = ${buildout:plone-user} -wsgi = off -eggs = - Plone - plone.app.upgrade - ${buildout:package-name} - ${buildout:eggs} -deprecation-warnings = on -environment-vars = - zope_i18n_compile_mo_files true -zcml = - -[i18ndude] -unzip = true -recipe = zc.recipe.egg -eggs = i18ndude - -[update_translations] -recipe = collective.recipe.template -output = ${buildout:directory}/bin/update_translations_storage -input = ${buildout:directory}/templates/update_translations.in -mode = 755 - -[write_code_headers] -recipe = collective.recipe.template -output = ${buildout:directory}/bin/write_code_headers_storage -input = ${buildout:directory}/templates/write_code_headers.py.in -mode = 755 - -[test] -recipe = zc.recipe.testrunner -defaults = ['--auto-color', '--auto-progress'] -eggs = - senaite.storage [test] - -[omelette] -recipe = collective.recipe.omelette -eggs = ${buildout:eggs} - -[versions] -# versions taken from requirements.txt -setuptools = -zc.buildout = diff --git a/src/senaite/storage/tests/doctests/PrimarySample.rst b/src/senaite/storage/tests/doctests/PrimarySample.rst index fe88008..48337d5 100644 --- a/src/senaite/storage/tests/doctests/PrimarySample.rst +++ b/src/senaite/storage/tests/doctests/PrimarySample.rst @@ -62,7 +62,7 @@ Create some baseline objects for the test: >>> sampletype = api.create(setup.bika_sampletypes, "SampleType", title="Water", Prefix="W") >>> labcontact = api.create(setup.bika_labcontacts, "LabContact", Firstname="Lab", Lastname="Manager") >>> department = api.create(portal.setup.departments, "Department", title="Chemistry", Manager=labcontact) - >>> category = api.create(setup.bika_analysiscategories, "AnalysisCategory", title="Metals", Department=department) + >>> category = api.create(portal.setup.analysiscategories, "AnalysisCategory", title="Metals", Department=department) >>> Cu = api.create(setup.bika_analysisservices, "AnalysisService", title="Copper", Keyword="Cu", Price="15", Category=category.UID(), Accredited=True) >>> Fe = api.create(setup.bika_analysisservices, "AnalysisService", title="Iron", Keyword="Fe", Price="10", Category=category.UID()) >>> Au = api.create(setup.bika_analysisservices, "AnalysisService", title="Gold", Keyword="Au", Price="20", Category=category.UID()) diff --git a/src/senaite/storage/tests/doctests/StorageWorkflow.rst b/src/senaite/storage/tests/doctests/StorageWorkflow.rst index 6edb10c..2dc9d38 100644 --- a/src/senaite/storage/tests/doctests/StorageWorkflow.rst +++ b/src/senaite/storage/tests/doctests/StorageWorkflow.rst @@ -64,7 +64,7 @@ We need to create some basic objects for the test: >>> sampletype = api.create(setup.bika_sampletypes, "SampleType", title="Water", Prefix="W") >>> labcontact = api.create(setup.bika_labcontacts, "LabContact", Firstname="Lab", Lastname="Manager") >>> department = api.create(portal.setup.departments, "Department", title="Chemistry", Manager=labcontact) - >>> category = api.create(setup.bika_analysiscategories, "AnalysisCategory", title="Metals", Department=department) + >>> category = api.create(portal.setup.analysiscategories, "AnalysisCategory", title="Metals", Department=department) >>> Cu = api.create(setup.bika_analysisservices, "AnalysisService", title="Copper", Keyword="Cu", Price="15", Category=category.UID(), Accredited=True) >>> Fe = api.create(setup.bika_analysisservices, "AnalysisService", title="Iron", Keyword="Fe", Price="10", Category=category.UID()) >>> Au = api.create(setup.bika_analysisservices, "AnalysisService", title="Gold", Keyword="Au", Price="20", Category=category.UID())