Merge 6a3ca92 into def8820

plonegovbr · Nov 22, 2017 · 395a31a · 395a31a
2 parents def8820 + 6a3ca92
commit 395a31a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,14 @@ Alterações
 1.3 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Atualiza dependências do pacote.
+  [hvelarde]
+
+- Remove dependência no plone.directives.form.
+  [hvelarde]
+
+- Garante uso de collective.z3cform.datagridfield >= 1.3 para evitar inclusão indireta do Grok.
+  [hvelarde]
 
 
 1.2 (2017-10-05)

diff --git a/buildout.cfg b/buildout.cfg
@@ -37,3 +37,5 @@ eggs = ${test:eggs}
 # baixado de novo: o fato dele estar no src não impede o download
 # dele de novo como um egg se ele estiver pinado no extends.
 brasil.gov.paginadestaque =
+# XXX: remover após atualização do versions.cfg principal
+collective.z3cform.datagridfield = 1.3
diff --git a/setup.py b/setup.py
@@ -38,25 +38,46 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
+        'AccessControl',
+        'collective.behavior.localdiazo',
+        'collective.behavior.localregistry',
         'collective.cover',
-        'collective.z3cform.datagridfield',
+        'collective.z3cform.datagridfield >=1.3',  # avoid dependency on five.grok
         'plone.api',
+        'plone.app.content',
+        'plone.app.dexterity',
+        'plone.app.tiles',
+        'plone.app.layout',
         'plone.app.upgrade',
+        'plone.autoform',
+        'plone.behavior',
+        'plone.dexterity',
+        'plone.memoize',
+        'plone.namedfile',
+        'plone.resource',
+        'plone.supermodel',
         'Products.CMFPlone >=4.3',
         'Products.GenericSetup',
         'sc.microsite >=1.0b4',
         'setuptools',
+        'z3c.form',
+        'zope.component',
         'zope.i18nmessageid',
         'zope.interface',
+        'zope.schema',
     ],
     extras_require={
         'test': [
             'mock',
             'plone.app.robotframework',
+            'plone.app.theming',
             'plone.app.testing [robot]',
             'plone.browserlayer',
+            'plone.registry',
             'plone.testing',
+            'plone.tiles',
             'robotsuite',
+            'transaction',
         ],
     },
     entry_points="""

diff --git a/src/brasil/gov/paginadestaque/behaviors/interfaces.py b/src/brasil/gov/paginadestaque/behaviors/interfaces.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 from collective.cover import _
-from plone.directives import form
+from plone.autoform.interfaces import IFormFieldProvider
 from plone.namedfile.field import NamedBlobImage
 from plone.supermodel import model
 from zope.interface import alsoProvides
@@ -19,4 +19,5 @@ class IBackgroundImage(model.Schema):
         required=False,
     )
 
-alsoProvides(IBackgroundImage, form.IFormFieldProvider)
+
+alsoProvides(IBackgroundImage, IFormFieldProvider)