buildout.coredev/5.1: merge branch '5.1' of github.com:plone/buildout.coredev into

Repository: buildout.coredev
Branch: refs/heads/5.1
Date: 2017-07-19T23:45:26+02:00
Author: Alexander Loechel (loechel) <[email protected]>
Commit: https://github.com/plone/buildout.coredev/commit/a1570350715dec715cde45a211fbd005c9efe97a

merge branch '5.1' of github.com:plone/buildout.coredev into 5.1

Files changed:
M checkouts.cfg
M last_commit.txt
M tests.cfg
M versions.cfg

diff --git a/checkouts.cfg b/checkouts.cfg
index 079c7b59f..1ec289872 100644
--- a/checkouts.cfg
+++ b/checkouts.cfg
@@ -4,8 +4,8 @@ auto-checkout =
     plone.app.locales
     plone.app.contenttypes
     plone.app.upgrade
-    plone.app.multilingual
     plone.app.robotframework
+    plone.batching
 # test-only fixes:
     five.pt
 # translations moved
@@ -17,10 +17,8 @@ auto-checkout =
     Products.CMFPlone
     Products.PortalTransforms
     plone.subrequest
-    plone.protect
-    plone.resourceeditor
     mockup
     plone.app.discussion
     plone.app.contentrules
     plone.app.linkintegrity
-    plone.app.textfield
+    plone.app.multilingual
diff --git a/last_commit.txt b/last_commit.txt
index b8b4e1819..cb63c9ca4 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -1,28 +1,100 @@
-Repository: plone.app.dexterity
+Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2017-07-17T15:01:28+02:00
+Date: 2017-07-19T15:03:30+02:00
 Author: Jens W. Klein (jensens) <jk-jUMamYRpa/IasaSY4/nUZ7NldLUNz+W/@public.gmane.org>
-Commit: https://github.com/plone/plone.app.dexterity/commit/1a6fc4ea40625ab636d96ecc6dd9bc7451bd7a16
+Commit: https://github.com/plone/plone.app.upgrade/commit/9f99dae94cf966b70c57175b7b69d8b1fc544ba5
 
-Fixes #252
+fixes #84 - bug while migration, aq_base function works
 
 Files changed:
-M docs/prerequisite.rst
+M CHANGES.rst
+M plone/app/upgrade/v50/final.py
 
-diff --git a/docs/prerequisite.rst b/docs/prerequisite.rst
-index f01e057..2cd7b2e 100644
---- a/docs/prerequisite.rst
-+++ b/docs/prerequisite.rst
-@@ -135,7 +135,7 @@ The ``include package=".browser"`` directive loads additional ZCML configuration
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 9785daa..266a629 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -15,7 +15,8 @@ New features:
  
- Finally, we register a GenericSetup profile to make the type installable, which we will build up over the next several sections.
+ Bug fixes:
  
--When you've got your project tuned up, return to your buildout/instance directory and edit buildout.cfg to add ``example.conference`` to your eggs list and ``src/example.conference`` to your develop sources list::
-+When you've got your project tuned up, return to your buildout/instance directory and edit buildout.cfg to add ``example.conference`` to your eggs list and ``src/example.conference`` to your develop sources list:
+-- *add item here*
++- Fix #84 - usage of aq_base
++  [jensens]
  
- .. code-block:: ini
  
+ 2.0.5 (2017-07-03)
+diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py
+index 57a6478..0f4b44a 100644
+--- a/plone/app/upgrade/v50/final.py
++++ b/plone/app/upgrade/v50/final.py
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++from Acquisition import aq_base
+ from plone.app.upgrade.utils import loadMigrationProfile
+ from plone.registry.interfaces import IRegistry
+ from Products.CMFCore.utils import getToolByName
+@@ -70,7 +71,7 @@ def refresh_getIcon_catalog_metadata(context):
+         for brain in zcatalog.unrestrictedSearchResults():
+             # First get the new value
+             obj = brain._unrestrictedGetObject()
+-            new_value = bool(getattr(obj.aq_base, 'image', False))
++            new_value = bool(getattr(aq_base(obj), 'image', False))
+ 
+             # We can now update the record with the new getIcon value
+             record = list(catalog.data[brain.getRID()])
+
+
+Repository: plone.app.upgrade
+
+
+Branch: refs/heads/master
+Date: 2017-07-19T18:44:25+02:00
+Author: agitator (agitator) <[email protected]>
+Commit: https://github.com/plone/plone.app.upgrade/commit/bdd0f9532ae0dca6fd47d56f9bb3d5ef0a05365c
+
+Merge pull request #128 from plone/fix-84
+
+fixes #84 - bug while migration, aq_base function works
+
+Files changed:
+M CHANGES.rst
+M plone/app/upgrade/v50/final.py
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 9785daa..266a629 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -15,7 +15,8 @@ New features:
+ 
+ Bug fixes:
+ 
+-- *add item here*
++- Fix #84 - usage of aq_base
++  [jensens]
+ 
+ 
+ 2.0.5 (2017-07-03)
+diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py
+index 57a6478..0f4b44a 100644
+--- a/plone/app/upgrade/v50/final.py
++++ b/plone/app/upgrade/v50/final.py
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++from Acquisition import aq_base
+ from plone.app.upgrade.utils import loadMigrationProfile
+ from plone.registry.interfaces import IRegistry
+ from Products.CMFCore.utils import getToolByName
+@@ -70,7 +71,7 @@ def refresh_getIcon_catalog_metadata(context):
+         for brain in zcatalog.unrestrictedSearchResults():
+             # First get the new value
+             obj = brain._unrestrictedGetObject()
+-            new_value = bool(getattr(obj.aq_base, 'image', False))
++            new_value = bool(getattr(aq_base(obj), 'image', False))
+ 
+             # We can now update the record with the new getIcon value
+             record = list(catalog.data[brain.getRID()])
 
 
diff --git a/tests.cfg b/tests.cfg
index 7e3b56978..416147c42 100644
--- a/tests.cfg
+++ b/tests.cfg
@@ -81,6 +81,7 @@ test-eggs =
     plone.recipe.zope2instance
     plone.registry
     plone.resource [test]
+    plone.resourceeditor [test]
     plone.rfc822
     plone.scale
     plone.schema
diff --git a/versions.cfg b/versions.cfg
index cf04d9846..8f0f8df39 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -203,13 +203,13 @@ plone.app.layout                      = 2.7.2
 plone.app.linkintegrity               = 3.3.1
 plone.app.locales                     = 5.1.3
 plone.app.lockingbehavior             = 1.0.5
-plone.app.multilingual                = 5.0.8
+plone.app.multilingual                = 5.1
 plone.app.portlets                    = 4.3.0
 plone.app.querystring                 = 1.4.5
 plone.app.redirector                  = 1.3.5
 plone.app.registry                    = 1.6.1
 plone.app.testing                     = 5.0.7
-plone.app.textfield                   = 1.2.8
+plone.app.textfield                   = 1.2.9
 plone.app.theming                     = 2.0.1
 plone.app.upgrade                     = 2.0.5
 plone.app.users                       = 2.4
@@ -245,11 +245,11 @@ plone.outputfilters                   = 3.0.2
 plone.portlet.collection              = 3.2
 plone.portlet.static                  = 3.1.1
 plone.portlets                        = 2.3
-plone.protect                         = 3.0.24
+plone.protect                         = 3.0.25
 plone.registry                        = 1.1.2
 plone.reload                          = 2.0.2
 plone.resource                        = 1.2.1
-plone.resourceeditor                  = 2.0.6
+plone.resourceeditor                  = 2.1
 plone.rfc822                          = 1.1.3
 plone.scale                           = 2.1.2
 plone.schema                          = 1.0.0
@@ -298,7 +298,7 @@ sourcecodegen                         = 0.6.14
 z3c.autoinclude                       = 0.3.7
 z3c.caching                           = 2.0a1
 z3c.form                              = 3.2.11
-z3c.formwidget.query                  = 0.13
+z3c.formwidget.query                  = 0.14
 z3c.pt                                = 3.0.0a1
 z3c.zcmlhook                          = 1.0b1
 zope.globalrequest                    = 1.2



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot