Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Declare all Zope, CMFCore and plone.base dependencies #79

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Declare all Zope, CMFCore and plone.base dependencies #79

merged 1 commit into from
Apr 12, 2023

Conversation

jensens
Copy link
Sponsor Member

@jensens jensens commented Apr 11, 2023

In order to reduce dependencies to declare, define Zope with all dependencies, add Products.CMFCore with its dependencies and correctly define plone.base. Use transitive dependencies here. It seems like dependencychecker correctly interprets them.

At some point we want to declare this for Products.CMFPlone as well, but not now.

This closes #58.

@jensens jensens requested a review from gforcada April 11, 2023 10:37
@jensens jensens mentioned this pull request Apr 11, 2023
Merged
@jensens
Copy link
Sponsor Member Author

jensens commented Apr 11, 2023

This works fine, tested with plone.base and plone.protect. It helps to avoid a bunch of transitive dependencies.

jensens added a commit to plone/plone.app.layout that referenced this pull request Apr 11, 2023
@jensens
cleanup dependencies again, now using plone/meta#79
0eb9060 
(cherry picked from commit b19212dc6762f12d5b3265e96573dc5d30885795)
mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Apr 11, 2023
@jensens
[fc] Repository: plone.app.layout
72b658a 
Branch: refs/heads/master
Date: 2023-04-07T17:09:49+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@0c31715

Configuring with plone/meta

Files changed:
A .editorconfig
A .meta.toml
A .pre-commit-config.yaml
A news/11f0db91.internal
A tox.ini
M pyproject.toml
M setup.cfg
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:11:29+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@4cb7fd9

chore: isort

Files changed:
M plone/app/layout/analytics/view.py
M plone/app/layout/favicon_handler.py
M plone/app/layout/globals/context.py
M plone/app/layout/globals/layout.py
M plone/app/layout/globals/portal.py
M plone/app/layout/globals/tests/test_context.py
M plone/app/layout/globals/tests/test_layout.py
M plone/app/layout/globals/tests/test_portal.py
M plone/app/layout/links/tests/test_favicon_viewlet.py
M plone/app/layout/links/viewlets.py
M plone/app/layout/sitemap/sitemap.py
M plone/app/layout/sitemap/tests/test_sitemap.py
M plone/app/layout/viewlets/common.py
M plone/app/layout/viewlets/social.py
M plone/app/layout/viewlets/tests/test_common.py
M plone/app/layout/viewlets/tests/test_content.py
M plone/app/layout/viewlets/tests/test_social.py
M plone/app/layout/viewlets/toolbar.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:12:17+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@e411880

chore: black

Files changed:
M plone/app/layout/analytics/view.py
M plone/app/layout/favicon_handler.py
M plone/app/layout/icons/icons.py
M plone/app/layout/links/tests/test_canonical_url.py
M plone/app/layout/links/viewlets.py
M plone/app/layout/navigation/navtree.py
M plone/app/layout/navigation/tests/test_root.py
M plone/app/layout/testing.py
M plone/app/layout/viewlets/common.py
M plone/app/layout/viewlets/content.py
M plone/app/layout/viewlets/social.py
M plone/app/layout/viewlets/tests/base.py
M plone/app/layout/viewlets/tests/test_common.py
M plone/app/layout/viewlets/tests/test_content.py
M plone/app/layout/viewlets/tests/test_social.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:12:51+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@d9925b7

chore: zpretty ZCML/XML

Files changed:
M plone/app/layout/analytics/configure.zcml
M plone/app/layout/configure.zcml
M plone/app/layout/globals/configure.zcml
M plone/app/layout/icons/configure.zcml
M plone/app/layout/links/configure.zcml
M plone/app/layout/navigation/configure.zcml
M plone/app/layout/nextprevious/configure.zcml
M plone/app/layout/permissions.zcml
M plone/app/layout/sitemap/configure.zcml
M plone/app/layout/sitemap/sitemap.xml
M plone/app/layout/viewlets/configure.zcml
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:13:50+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@ebd1f20

chore: zpretty PT

Files changed:
M plone/app/layout/analytics/view.pt
M plone/app/layout/globals/tests/data/bodyclass_nametest.pt
M plone/app/layout/links/author.pt
M plone/app/layout/links/favicon.pt
M plone/app/layout/links/rsslink.pt
M plone/app/layout/links/search.pt
M plone/app/layout/nextprevious/links.pt
M plone/app/layout/nextprevious/nextprevious.pt
M plone/app/layout/viewlets/anontools.pt
M plone/app/layout/viewlets/colophon.pt
M plone/app/layout/viewlets/content_history.pt
M plone/app/layout/viewlets/contentviews.pt
M plone/app/layout/viewlets/document_actions.pt
M plone/app/layout/viewlets/document_byline.pt
M plone/app/layout/viewlets/document_relateditems.pt
M plone/app/layout/viewlets/document_rights.pt
M plone/app/layout/viewlets/dublin_core.pt
M plone/app/layout/viewlets/globalstatusmessage.pt
M plone/app/layout/viewlets/history_view.pt
M plone/app/layout/viewlets/keywords.pt
M plone/app/layout/viewlets/logo.pt
M plone/app/layout/viewlets/membertools.pt
M plone/app/layout/viewlets/menu.pt
M plone/app/layout/viewlets/path_bar.pt
M plone/app/layout/viewlets/popup_content_history.pt
M plone/app/layout/viewlets/review_history.pt
M plone/app/layout/viewlets/searchbox.pt
M plone/app/layout/viewlets/sections.pt
M plone/app/layout/viewlets/site_actions.pt
M plone/app/layout/viewlets/social_tags.pt
M plone/app/layout/viewlets/social_tags_body.pt
M plone/app/layout/viewlets/tiny_logo.pt
M plone/app/layout/viewlets/toc.pt
M plone/app/layout/viewlets/toolbar.pt
M plone/app/layout/viewlets/viewport.pt
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:14:30+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@b5f22dc

feat: flake8

Files changed:
M plone/app/layout/testing.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T17:21:32+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@f3eaeb5

feat: codespell

Files changed:
M CHANGES.rst
M plone/app/layout/globals/interface.py
M plone/app/layout/globals/interfaces.py
M plone/app/layout/globals/tests/test_layout.py
M plone/app/layout/navigation/navtree.py
M plone/app/layout/sitemap/tests/test_sitemap.py
M plone/app/layout/viewlets/common.py
M plone/app/layout/viewlets/tests/history.txt
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T18:21:12+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@33a1714

fix: adjust tests for zpretty

Files changed:
M plone/app/layout/sitemap/tests/test_sitemap.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T18:22:09+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@1f5c1f0

feat: configure z3c.dependencychecker

Files changed:
M pyproject.toml
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T19:54:11+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@f91e7e8

feat: drop a few CMFPlone imports

Files changed:
M plone/app/layout/globals/portal.py
M plone/app/layout/viewlets/content.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-07T19:54:11+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.layout@8eed423

feat: declare dependencies

Files changed:
M setup.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-11T17:24:50+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.layout@0eb9060

cleanup dependencies again, now using plone/meta#79

(cherry picked from commit b19212dc6762f12d5b3265e96573dc5d30885795)

Files changed:
M setup.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2023-04-11T17:32:54+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.layout@4485a96

Merge pull request #334 from plone/config-with-default-template-6139b94b

Config with default template

Files changed:
A .editorconfig
A .meta.toml
A .pre-commit-config.yaml
A news/11f0db91.internal
A tox.ini
M CHANGES.rst
M plone/app/layout/analytics/configure.zcml
M plone/app/layout/analytics/view.pt
M plone/app/layout/analytics/view.py
M plone/app/layout/configure.zcml
M plone/app/layout/favicon_handler.py
M plone/app/layout/globals/configure.zcml
M plone/app/layout/globals/context.py
M plone/app/layout/globals/interface.py
M plone/app/layout/globals/interfaces.py
M plone/app/layout/globals/layout.py
M plone/app/layout/globals/portal.py
M plone/app/layout/globals/tests/data/bodyclass_nametest.pt
M plone/app/layout/globals/tests/test_context.py
M plone/app/layout/globals/tests/test_layout.py
M plone/app/layout/globals/tests/test_portal.py
M plone/app/layout/icons/configure.zcml
M plone/app/layout/icons/icons.py
M plone/app/layout/links/author.pt
M plone/app/layout/links/configure.zcml
M plone/app/layout/links/favicon.pt
M plone/app/layout/links/rsslink.pt
M plone/app/layout/links/search.pt
M plone/app/layout/links/tests/test_canonical_url.py
M plone/app/layout/links/tests/test_favicon_viewlet.py
M plone/app/layout/links/viewlets.py
M plone/app/layout/navigation/configure.zcml
M plone/app/layout/navigation/navtree.py
M plone/app/layout/navigation/tests/test_root.py
M plone/app/layout/nextprevious/configure.zcml
M plone/app/layout/nextprevious/links.pt
M plone/app/layout/nextprevious/nextprevious.pt
M plone/app/layout/permissions.zcml
M plone/app/layout/sitemap/configure.zcml
M plone/app/layout/sitemap/sitemap.py
M plone/app/layout/sitemap/sitemap.xml
M plone/app/layout/sitemap/tests/test_sitemap.py
M plone/app/layout/testing.py
M plone/app/layout/viewlets/anontools.pt
M plone/app/layout/viewlets/colophon.pt
M plone/app/layout/viewlets/common.py
M plone/app/layout/viewlets/configure.zcml
M plone/app/layout/viewlets/content.py
M plone/app/layout/viewlets/content_history.pt
M plone/app/layout/viewlets/contentviews.pt
M plone/app/layout/viewlets/document_actions.pt
M plone/app/layout/viewlets/document_byline.pt
M plone/app/layout/viewlets/document_relateditems.pt
M plone/app/layout/viewlets/document_rights.pt
M plone/app/layout/viewlets/dublin_core.pt
M plone/app/layout/viewlets/globalstatusmessage.pt
M plone/app/layout/viewlets/history_view.pt
M plone/app/layout/viewlets/keywords.pt
M plone/app/layout/viewlets/logo.pt
M plone/app/layout/viewlets/membertools.pt
M plone/app/layout/viewlets/menu.pt
M plone/app/layout/viewlets/path_bar.pt
M plone/app/layout/viewlets/popup_content_history.pt
M plone/app/layout/viewlets/review_history.pt
M plone/app/layout/viewlets/searchbox.pt
M plone/app/layout/viewlets/sections.pt
M plone/app/layout/viewlets/site_actions.pt
M plone/app/layout/viewlets/social.py
M plone/app/layout/viewlets/social_tags.pt
M plone/app/layout/viewlets/social_tags_body.pt
M plone/app/layout/viewlets/tests/base.py
M plone/app/layout/viewlets/tests/history.txt
M plone/app/layout/viewlets/tests/test_common.py
M plone/app/layout/viewlets/tests/test_content.py
M plone/app/layout/viewlets/tests/test_social.py
M plone/app/layout/viewlets/tiny_logo.pt
M plone/app/layout/viewlets/toc.pt
M plone/app/layout/viewlets/toolbar.pt
M plone/app/layout/viewlets/toolbar.py
M plone/app/layout/viewlets/viewport.pt
M pyproject.toml
M setup.cfg
M setup.py
This was referenced Apr 11, 2023
Open
Merged
gforcada
gforcada requested changes Apr 11, 2023
View reviewed changes
config/default/pyproject.toml.j2 Show resolved Hide resolved
config/default/pyproject.toml.j2 Show resolved Hide resolved
@gforcada gforcada merged commit 234bb1d into master Apr 12, 2023
@gforcada gforcada deleted the declare-all-dependencies branch April 12, 2023 21:37
@mauritsvanrees
Copy link
Sponsor Member

This does mean that we have to watch when Zope, Products.CMFCore or plone.base drop dependencies...

@mauritsvanrees
Copy link
Sponsor Member

Also, why does this close issue #58? I don't see any relation between this PR and the zip_safe flag.

@gforcada
Copy link
Sponsor Member

a typo I guess 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gforcada gforcada gforcada approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove setuptools zip_safe flag?
3 participants
@jensens @mauritsvanrees @gforcada