From 70e78b691c8868095ff07d94e31fd2bb0e40e690 Mon Sep 17 00:00:00 2001 From: Tom Gross Date: Thu, 21 Aug 2014 15:03:12 +0200 Subject: [PATCH 1/5] remove c.testcaselayer. with p.a.testing it is not needed any longer --- checkouts.cfg | 5 +++++ sources.cfg | 1 - tests.cfg | 2 -- versions.cfg | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/checkouts.cfg b/checkouts.cfg index 24adeb6544..bf1e46034f 100644 --- a/checkouts.cfg +++ b/checkouts.cfg @@ -4,6 +4,8 @@ auto-checkout = Products.ATContentTypes Products.Archetypes Products.CMFPlone + Products.CMFDiffTool + Products.CMFEditions Products.CMFQuickInstallerTool Products.GenericSetup Products.PasswordResetTool @@ -28,6 +30,7 @@ auto-checkout = plone.app.theming plone.app.upgrade plone.app.users + plone.app.versioningbehavior plone.app.viewletmanager plone.app.vocabularies plone.app.workflow @@ -41,6 +44,7 @@ auto-checkout = plone.supermodel plone.testing plonetheme.barceloneta + plonetheme.sunburst # test fixes only plone.app.contentrules plone.app.blob @@ -50,6 +54,7 @@ auto-checkout = plone.app.i18n plone.app.openid plone.app.referenceablebehavior + plone.app.textfield plone.app.widgets plone.browserlayer plone.caching diff --git a/sources.cfg b/sources.cfg index bc34c0e548..78393b8b46 100644 --- a/sources.cfg +++ b/sources.cfg @@ -32,7 +32,6 @@ archetypes.schemaextender = git ${remotes:plone}/archetypes.schemaexte borg.localrole = git ${remotes:plone}/borg.localrole.git pushurl=${remotes:plone_push}/borg.localrole.git branch=master collective.elephantvocabulary = git ${remotes:collective}/collective.elephantvocabulary.git pushurl=${remotes:collective_push}/collective.elephantvocabulary.git branch=master collective.monkeypatcher = git ${remotes:plone}/collective.monkeypatcher.git pushurl=${remotes:plone_push}/collective.monkeypatcher.git branch=master -collective.testcaselayer = git ${remotes:collective}/collective.testcaselayer.git pushurl=${remotes:collective_push}/collective.testcaselayer.git branch=master collective.xmltestreport = git ${remotes:collective}/collective.xmltestreport.git pushurl=${remotes:collective_push}/collective.xmltestreport.git branch=master diazo = git ${remotes:plone}/diazo.git pushurl=${remotes:plone_push}/diazo.git branch=master five.customerize = git ${remotes:zopegit}/five.customerize.git pushurl=${remotes:zopegit_push}/five.customerize.git branch=master diff --git a/tests.cfg b/tests.cfg index 39fab3ea05..3688261901 100644 --- a/tests.cfg +++ b/tests.cfg @@ -37,7 +37,6 @@ test-eggs = borg.localrole collective.elephantvocabulary collective.monkeypatcher - collective.testcaselayer diazo [test] five.customerize five.formlib @@ -402,7 +401,6 @@ exclude = ZODB3 argh archetypes.schemaextender - collective.testcaselayer decorator docutils doctest diff --git a/versions.cfg b/versions.cfg index a8a3490bb5..40d6688941 100644 --- a/versions.cfg +++ b/versions.cfg @@ -125,7 +125,6 @@ archetypes.referencebrowserwidget = 2.5.1 archetypes.schemaextender = 2.1.3 borg.localrole = 3.1 collective.monkeypatcher = 1.0.1 -collective.testcaselayer = 1.6 diazo = 1.0.5 five.customerize = 1.1 five.formlib = 1.0.4 From 0bbc2ce66fbbe43dd27504e3a2fdc10958d71bf4 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Tue, 23 Sep 2014 14:55:29 +0200 Subject: [PATCH 2/5] added plone.app.iterate to checkouts --- checkouts.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/checkouts.cfg b/checkouts.cfg index 45ec0bd5a9..7dc87efa30 100644 --- a/checkouts.cfg +++ b/checkouts.cfg @@ -20,6 +20,7 @@ auto-checkout = plone.app.controlpanel plone.app.dexterity plone.app.discussion + plone.app.iterate plone.app.jquerytools plone.app.layout plone.app.linkintegrity From b21d21727437aa3625bf462590cc806f0709ecbd Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Tue, 23 Sep 2014 15:43:10 +0200 Subject: [PATCH 3/5] build status icons --- README.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.rst b/README.rst index a4af4e6536..6feec2ef3c 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,12 @@ + +.. image:: http://jenkins.plone.org/buildStatus/icon?job=plone-5.0-python-2.7 + :target: http://jenkins.plone.org/job/plone-5.0-python-2.7/ + :alt: Jenkins CI - Plone 5.0 - core + +.. image:: http://jenkins.plone.org/buildStatus/icon?job=plone-5.0-python-2.7-at + :target: http://jenkins.plone.org/job/plone-5.0-python-2.7/ + :alt: Jenkins CI - Plone 5.0 - with Archetypes + Introduction ============ This is the development buildout for Plone Core. You are on the version 5.0 branch. If this is your first time here, please read ALL if the instructions at `readthedocs.org `_ before getting started. It will save you time in the end, we promise! From be0fb96419a780904805fab8f42e3d1af0220470 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Tue, 23 Sep 2014 15:45:40 +0200 Subject: [PATCH 4/5] build status - finetuning --- README.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6feec2ef3c..67acd9b10a 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,16 @@ +Build Status +============ + +Jenkins CI - Plone 5.0 - core: .. image:: http://jenkins.plone.org/buildStatus/icon?job=plone-5.0-python-2.7 :target: http://jenkins.plone.org/job/plone-5.0-python-2.7/ :alt: Jenkins CI - Plone 5.0 - core +Jenkins CI - Plone 5.0 - with archetypes: + .. image:: http://jenkins.plone.org/buildStatus/icon?job=plone-5.0-python-2.7-at - :target: http://jenkins.plone.org/job/plone-5.0-python-2.7/ + :target: http://jenkins.plone.org/job/plone-5.0-python-2.7-at/ :alt: Jenkins CI - Plone 5.0 - with Archetypes Introduction From 3008ba337a06ff293e2c048a5c18dfb431804d63 Mon Sep 17 00:00:00 2001 From: Tom Gross Date: Wed, 24 Sep 2014 15:44:19 +0200 Subject: [PATCH 5/5] added p.a.imaging to checkouts --- checkouts.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkouts.cfg b/checkouts.cfg index bf1e46034f..d035aa7a3e 100644 --- a/checkouts.cfg +++ b/checkouts.cfg @@ -44,7 +44,6 @@ auto-checkout = plone.supermodel plone.testing plonetheme.barceloneta - plonetheme.sunburst # test fixes only plone.app.contentrules plone.app.blob @@ -52,6 +51,7 @@ auto-checkout = plone.app.customerize plone.app.dexterity plone.app.i18n + plone.app.imaging plone.app.openid plone.app.referenceablebehavior plone.app.textfield