New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on CMFDefault #438

Merged
merged 9 commits into from Apr 18, 2015

Conversation

Projects
None yet
8 participants
@tomgross
Member

tomgross commented Apr 11, 2015

No description provided.

@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 11, 2015

Testing it on http://jenkins.plone.org/job/pull-request/76

Not sure if we want to merge this on master right now as we are already on beta... /cc @tisto @esteele

@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 11, 2015

Forgot to say that great to see a package dependency being removed!

@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 11, 2015

You can check which packages are using CMF packages here also: http://jenkins.plone.org/view/Dependencies/job/plone-package-dependencies-cmf/

@davisagli

This comment has been minimized.

Member

davisagli commented Apr 11, 2015

I think we can merge this work in beta -- we still have time to fix any regressions -- but we should make sure that Products.CMFDefault is still present in the python environment in case addons still use it, so that they aren't forced to do more work to be Plone 5 compatible. Maybe there's a way we can make importing from it show a warning.

I'm a bit confused by the changes -- it looks like the PloneFolder module is removed, but is still referenced from Portal.py. Do you have a .pyc file lying around?

@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 12, 2015

@tomgross there are quite a few test failures on other packages: http://jenkins.plone.org/job/pull-request/76/console

Maybe is worth creating a cfg file on plips folder in buildout.coredev to keep all needed related branches together.

Creating a jenkins job for it is really easy, let us know about it (create a ticket on https://github.com/plone/jenkins.plone.org)

@@ -34,7 +34,7 @@
ManagePortal, ManageUsers, ModifyPortalContent, View
from Products.CMFCore.interfaces import IDublinCore, IMutableDublinCore
from Products.CMFCore.WorkflowCore import WorkflowException
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from .DublinCore import DefaultDublinCoreImpl

This comment has been minimized.

@mauritsvanrees

mauritsvanrees Apr 13, 2015

Member

Minor thing: plone.api convention says: do not use relative imports:
http://ploneapi.readthedocs.org/en/latest/contribute/conventions.html#about-imports

This comment has been minimized.

@gforcada

gforcada Apr 13, 2015

Contributor

👍

This comment has been minimized.

@tisto

This comment has been minimized.

This comment has been minimized.

@mauritsvanrees

mauritsvanrees Apr 17, 2015

Member

Not anymore. ;-) I fixed those just now on master at f4322dc.
And to put my money/time where my mouth is, I fixed the new ones on this branch as well, at 8c0ad6c.

@tomgross

This comment has been minimized.

Member

tomgross commented Apr 13, 2015

@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 13, 2015

@tisto

This comment has been minimized.

Member

tisto commented Apr 14, 2015

@tomgross Awesome! Thanks for working on that! +1 for a merge if @esteele is ok with that.

@tisto

This comment has been minimized.

Member

tisto commented Apr 14, 2015

@esteele

This comment has been minimized.

Member

esteele commented Apr 14, 2015

Absolutely. Nice work!

On 14 Apr 2015, at 1:27, Timo Stollenwerk wrote:

@tomgross Awesome! Thanks for working on that! +1 for a merge if
@esteele is ok with that.


Reply to this email directly or view it on GitHub:
#438 (comment)

@tisto

This comment has been minimized.

Member

tisto commented Apr 14, 2015

The plip job somehow does not checkout the correct branch. I get quite a few test failures when I check out the branch manually.

@tisto

This comment has been minimized.

Member

tisto commented Apr 14, 2015

@tomgross I fixed the plip job configuration. Your branch was not fetched at all. There are quite a few test failures in CMFPlone:

http://jenkins.plone.org/view/PLIPs/job/plip-noncmfdefault/3/console

@tomgross

This comment has been minimized.

Member

tomgross commented Apr 17, 2015

readded accidentally deleted PloneFolder. All tests pass on my machine now.

@tisto

This comment has been minimized.

Member

tisto commented Apr 17, 2015

@tomgross both jobs show two failing tests.

do3cc and others added some commits Apr 13, 2015

Update tests
- Remove workaround for plone.app.testing bug
- Remove outdated test that tested templates from skin layers. These
  are going away
- Update tests to new default view names from plone.app.contenttypes
  These test failures were masked by the plone.app.testing bug

Fixes some of the tests for d57a09966865809b27f6e3a1b4a1fdd851112a2a
Fix another bad test
Now that browser layers get properly initialized, tests
that try to trigger manual initalization have to reset some state first.
Fix for d57a09966865809b27f6e3a1b4a1fdd851112a2a
@tomgross

This comment has been minimized.

Member

tomgross commented Apr 17, 2015

The branch was not in sync with master. I fixed it meanwhile.

@gforcada

This comment has been minimized.

tisto added a commit that referenced this pull request Apr 18, 2015

@tisto tisto merged commit a2ed3c5 into master Apr 18, 2015

@tisto tisto deleted the tomgross-nocmfdefault branch Apr 18, 2015

@tisto

This comment has been minimized.

Member

tisto commented Apr 18, 2015

$ grep -R --include=*.py 'Products.CMFDefault' src/

src//plone.app.content/plone/app/content/container.py:from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
src//plone.app.content/plone/app/content/item.py:from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
src//plone.app.content/setup.py:        'Products.CMFDefault',
src//plone.app.contentrules/setup.py:        'Products.CMFDefault',
src//plone.app.contenttypes/plone/app/contenttypes/migration/browser.py:from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
src//plone.app.contenttypes/plone/app/contenttypes/setuphandlers.py:from Products.CMFDefault.utils import bodyfinder
src//plone.app.controlpanel/plone/app/controlpanel/filter.py:from Products.CMFDefault.formlib.schema import SchemaAdapterBase
src//plone.app.controlpanel/plone/app/controlpanel/language.py:from Products.CMFDefault.formlib.schema import SchemaAdapterBase
src//plone.app.controlpanel/plone/app/controlpanel/ram.py:from Products.CMFDefault.formlib.schema import SchemaAdapterBase
src//plone.app.controlpanel/plone/app/controlpanel/skins.py:from Products.CMFDefault.formlib.schema import SchemaAdapterBase
src//plone.app.controlpanel/setup.py:        'Products.CMFDefault',
src//plone.app.form/setup.py:          'Products.CMFDefault',
src//plone.app.testing/plone/app/testing/layers.py:        ('Products.CMFDefault',                  {'loadZCML': True}, ),
src//plone.theme/plone/theme/interfaces.py:    from Products.CMFDefault.interfaces import ICMFDefaultSkin as IDefaultBrowserLayer
src//plone.theme/plone/theme/layer.py:    from Products.CMFDefault.interfaces import ICMFDefaultSkin
src//Products.ATContentTypes/Products/ATContentTypes/content/document.py:from Products.CMFDefault.utils import SimpleHTMLParser
src//Products.ATContentTypes/Products/ATContentTypes/setuphandlers.py:from Products.CMFDefault.utils import bodyfinder
src//Products.ATContentTypes/Products/ATContentTypes/tool/metadata.py:from Products.CMFDefault.MetadataTool import MetadataTool as BaseTool
src//Products.ATContentTypes/setup.py:          'Products.CMFDefault',
@gforcada

This comment has been minimized.

Contributor

gforcada commented Apr 18, 2015

gforcada added a commit that referenced this pull request Apr 13, 2017

Cleanup CMFDefault references
Products.CMFDefault got removed long ago #438

These lines should not be relevant anymore.

jensens added a commit that referenced this pull request Apr 13, 2017

Cleanup CMFDefault references (#2017)
Cleanup CMFDefault references

Products.CMFDefault got removed long ago #438

These lines should not be relevant anymore.

mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Apr 13, 2017

[fc] Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2017-04-14T01:29:09+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/Products.CMFPlone@2465f73

Cleanup CMFDefault references (#2017)

Cleanup CMFDefault references

Products.CMFDefault got removed long ago plone/Products.CMFPlone#438

These lines should not be relevant anymore.

Files changed:
M CHANGES.rst
M Products/CMFPlone/meta.zcml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment