diff --git a/.flake8 b/.flake8 index c89c12631..f98a1ca72 100644 --- a/.flake8 +++ b/.flake8 @@ -13,7 +13,7 @@ ignore = # black takes care of spaces after commas E231, per-file-ignores = - plone/app/event/ical/__init__.py:F401 + src/plone/app/event/ical/__init__.py:F401 ## # Add extra configuration options in .meta.toml: diff --git a/MANIFEST.in b/MANIFEST.in index 58eb906ff..4bc2a0a61 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,7 @@ include *.rst include LICENSE.GPL recursive-include docs * -recursive-include plone * +recursive-include src * global-include *.mo global-exclude *pyc *~ prune devsrc diff --git a/news/172.bugfix b/news/172.bugfix new file mode 100644 index 000000000..ab547f97f --- /dev/null +++ b/news/172.bugfix @@ -0,0 +1 @@ +Fixed editable install with pip by moving code to ``src/plone``. [maurits] diff --git a/setup.py b/setup.py index 882439358..f45223887 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,8 @@ author_email="plone-developers@lists.sourceforge.net", url="https://github.com/plone/plone.app.event", license="GPL version 2", - packages=find_packages(), + packages=find_packages(where="src"), + package_dir={"": "src"}, namespace_packages=["plone", "plone.app"], include_package_data=True, python_requires=">=3.8", diff --git a/plone/__init__.py b/src/plone/__init__.py similarity index 100% rename from plone/__init__.py rename to src/plone/__init__.py diff --git a/plone/app/__init__.py b/src/plone/app/__init__.py similarity index 100% rename from plone/app/__init__.py rename to src/plone/app/__init__.py diff --git a/plone/app/event/__init__.py b/src/plone/app/event/__init__.py similarity index 100% rename from plone/app/event/__init__.py rename to src/plone/app/event/__init__.py diff --git a/plone/app/event/base.py b/src/plone/app/event/base.py similarity index 100% rename from plone/app/event/base.py rename to src/plone/app/event/base.py diff --git a/plone/app/event/browser/__init__.py b/src/plone/app/event/browser/__init__.py similarity index 100% rename from plone/app/event/browser/__init__.py rename to src/plone/app/event/browser/__init__.py diff --git a/plone/app/event/browser/configure.zcml b/src/plone/app/event/browser/configure.zcml similarity index 100% rename from plone/app/event/browser/configure.zcml rename to src/plone/app/event/browser/configure.zcml diff --git a/plone/app/event/browser/event_listing.pt b/src/plone/app/event/browser/event_listing.pt similarity index 100% rename from plone/app/event/browser/event_listing.pt rename to src/plone/app/event/browser/event_listing.pt diff --git a/plone/app/event/browser/event_listing.py b/src/plone/app/event/browser/event_listing.py similarity index 100% rename from plone/app/event/browser/event_listing.py rename to src/plone/app/event/browser/event_listing.py diff --git a/plone/app/event/browser/event_summary.pt b/src/plone/app/event/browser/event_summary.pt similarity index 100% rename from plone/app/event/browser/event_summary.pt rename to src/plone/app/event/browser/event_summary.pt diff --git a/plone/app/event/browser/event_summary.py b/src/plone/app/event/browser/event_summary.py similarity index 100% rename from plone/app/event/browser/event_summary.py rename to src/plone/app/event/browser/event_summary.py diff --git a/plone/app/event/browser/event_view.pt b/src/plone/app/event/browser/event_view.pt similarity index 100% rename from plone/app/event/browser/event_view.pt rename to src/plone/app/event/browser/event_view.pt diff --git a/plone/app/event/browser/event_view.py b/src/plone/app/event/browser/event_view.py similarity index 100% rename from plone/app/event/browser/event_view.py rename to src/plone/app/event/browser/event_view.py diff --git a/plone/app/event/browser/formatted_date.pt b/src/plone/app/event/browser/formatted_date.pt similarity index 100% rename from plone/app/event/browser/formatted_date.pt rename to src/plone/app/event/browser/formatted_date.pt diff --git a/plone/app/event/browser/formatted_date.py b/src/plone/app/event/browser/formatted_date.py similarity index 100% rename from plone/app/event/browser/formatted_date.py rename to src/plone/app/event/browser/formatted_date.py diff --git a/plone/app/event/browser/formatted_start_date.pt b/src/plone/app/event/browser/formatted_start_date.pt similarity index 100% rename from plone/app/event/browser/formatted_start_date.pt rename to src/plone/app/event/browser/formatted_start_date.pt diff --git a/plone/app/event/browser/leadimage_viewlet.py b/src/plone/app/event/browser/leadimage_viewlet.py similarity index 100% rename from plone/app/event/browser/leadimage_viewlet.py rename to src/plone/app/event/browser/leadimage_viewlet.py diff --git a/plone/app/event/browser/resources/calendar.svg b/src/plone/app/event/browser/resources/calendar.svg similarity index 100% rename from plone/app/event/browser/resources/calendar.svg rename to src/plone/app/event/browser/resources/calendar.svg diff --git a/plone/app/event/browser/resources/event.js b/src/plone/app/event/browser/resources/event.js similarity index 100% rename from plone/app/event/browser/resources/event.js rename to src/plone/app/event/browser/resources/event.js diff --git a/plone/app/event/configure.zcml b/src/plone/app/event/configure.zcml similarity index 100% rename from plone/app/event/configure.zcml rename to src/plone/app/event/configure.zcml diff --git a/plone/app/event/dx/__init__.py b/src/plone/app/event/dx/__init__.py similarity index 100% rename from plone/app/event/dx/__init__.py rename to src/plone/app/event/dx/__init__.py diff --git a/plone/app/event/dx/behaviors.py b/src/plone/app/event/dx/behaviors.py similarity index 100% rename from plone/app/event/dx/behaviors.py rename to src/plone/app/event/dx/behaviors.py diff --git a/plone/app/event/dx/configure.zcml b/src/plone/app/event/dx/configure.zcml similarity index 100% rename from plone/app/event/dx/configure.zcml rename to src/plone/app/event/dx/configure.zcml diff --git a/plone/app/event/dx/ical.zcml b/src/plone/app/event/dx/ical.zcml similarity index 100% rename from plone/app/event/dx/ical.zcml rename to src/plone/app/event/dx/ical.zcml diff --git a/plone/app/event/dx/interfaces.py b/src/plone/app/event/dx/interfaces.py similarity index 100% rename from plone/app/event/dx/interfaces.py rename to src/plone/app/event/dx/interfaces.py diff --git a/plone/app/event/dx/traverser.py b/src/plone/app/event/dx/traverser.py similarity index 100% rename from plone/app/event/dx/traverser.py rename to src/plone/app/event/dx/traverser.py diff --git a/plone/app/event/ical/__init__.py b/src/plone/app/event/ical/__init__.py similarity index 100% rename from plone/app/event/ical/__init__.py rename to src/plone/app/event/ical/__init__.py diff --git a/plone/app/event/ical/configure.zcml b/src/plone/app/event/ical/configure.zcml similarity index 100% rename from plone/app/event/ical/configure.zcml rename to src/plone/app/event/ical/configure.zcml diff --git a/plone/app/event/ical/exporter.py b/src/plone/app/event/ical/exporter.py similarity index 100% rename from plone/app/event/ical/exporter.py rename to src/plone/app/event/ical/exporter.py diff --git a/plone/app/event/ical/importer.py b/src/plone/app/event/ical/importer.py similarity index 100% rename from plone/app/event/ical/importer.py rename to src/plone/app/event/ical/importer.py diff --git a/plone/app/event/interfaces.py b/src/plone/app/event/interfaces.py similarity index 100% rename from plone/app/event/interfaces.py rename to src/plone/app/event/interfaces.py diff --git a/plone/app/event/permissions.zcml b/src/plone/app/event/permissions.zcml similarity index 100% rename from plone/app/event/permissions.zcml rename to src/plone/app/event/permissions.zcml diff --git a/plone/app/event/portlets/__init__.py b/src/plone/app/event/portlets/__init__.py similarity index 100% rename from plone/app/event/portlets/__init__.py rename to src/plone/app/event/portlets/__init__.py diff --git a/plone/app/event/portlets/configure.zcml b/src/plone/app/event/portlets/configure.zcml similarity index 100% rename from plone/app/event/portlets/configure.zcml rename to src/plone/app/event/portlets/configure.zcml diff --git a/plone/app/event/portlets/portlet_calendar.pt b/src/plone/app/event/portlets/portlet_calendar.pt similarity index 100% rename from plone/app/event/portlets/portlet_calendar.pt rename to src/plone/app/event/portlets/portlet_calendar.pt diff --git a/plone/app/event/portlets/portlet_calendar.py b/src/plone/app/event/portlets/portlet_calendar.py similarity index 100% rename from plone/app/event/portlets/portlet_calendar.py rename to src/plone/app/event/portlets/portlet_calendar.py diff --git a/plone/app/event/portlets/portlet_events.pt b/src/plone/app/event/portlets/portlet_events.pt similarity index 100% rename from plone/app/event/portlets/portlet_events.pt rename to src/plone/app/event/portlets/portlet_events.pt diff --git a/plone/app/event/portlets/portlet_events.py b/src/plone/app/event/portlets/portlet_events.py similarity index 100% rename from plone/app/event/portlets/portlet_events.py rename to src/plone/app/event/portlets/portlet_events.py diff --git a/plone/app/event/profiles/default/actions.xml b/src/plone/app/event/profiles/default/actions.xml similarity index 100% rename from plone/app/event/profiles/default/actions.xml rename to src/plone/app/event/profiles/default/actions.xml diff --git a/plone/app/event/profiles/default/browserlayer.xml b/src/plone/app/event/profiles/default/browserlayer.xml similarity index 100% rename from plone/app/event/profiles/default/browserlayer.xml rename to src/plone/app/event/profiles/default/browserlayer.xml diff --git a/plone/app/event/profiles/default/controlpanel.xml b/src/plone/app/event/profiles/default/controlpanel.xml similarity index 100% rename from plone/app/event/profiles/default/controlpanel.xml rename to src/plone/app/event/profiles/default/controlpanel.xml diff --git a/plone/app/event/profiles/default/metadata.xml b/src/plone/app/event/profiles/default/metadata.xml similarity index 100% rename from plone/app/event/profiles/default/metadata.xml rename to src/plone/app/event/profiles/default/metadata.xml diff --git a/plone/app/event/profiles/default/plone.app.event-default.txt b/src/plone/app/event/profiles/default/plone.app.event-default.txt similarity index 100% rename from plone/app/event/profiles/default/plone.app.event-default.txt rename to src/plone/app/event/profiles/default/plone.app.event-default.txt diff --git a/plone/app/event/profiles/default/portlets.xml b/src/plone/app/event/profiles/default/portlets.xml similarity index 100% rename from plone/app/event/profiles/default/portlets.xml rename to src/plone/app/event/profiles/default/portlets.xml diff --git a/plone/app/event/profiles/default/registry.xml b/src/plone/app/event/profiles/default/registry.xml similarity index 100% rename from plone/app/event/profiles/default/registry.xml rename to src/plone/app/event/profiles/default/registry.xml diff --git a/plone/app/event/profiles/default/rolemap.xml b/src/plone/app/event/profiles/default/rolemap.xml similarity index 100% rename from plone/app/event/profiles/default/rolemap.xml rename to src/plone/app/event/profiles/default/rolemap.xml diff --git a/plone/app/event/profiles/default/types.xml b/src/plone/app/event/profiles/default/types.xml similarity index 100% rename from plone/app/event/profiles/default/types.xml rename to src/plone/app/event/profiles/default/types.xml diff --git a/plone/app/event/profiles/default/types/Collection.xml b/src/plone/app/event/profiles/default/types/Collection.xml similarity index 100% rename from plone/app/event/profiles/default/types/Collection.xml rename to src/plone/app/event/profiles/default/types/Collection.xml diff --git a/plone/app/event/profiles/default/types/Folder.xml b/src/plone/app/event/profiles/default/types/Folder.xml similarity index 100% rename from plone/app/event/profiles/default/types/Folder.xml rename to src/plone/app/event/profiles/default/types/Folder.xml diff --git a/plone/app/event/profiles/default/types/Plone_Site.xml b/src/plone/app/event/profiles/default/types/Plone_Site.xml similarity index 100% rename from plone/app/event/profiles/default/types/Plone_Site.xml rename to src/plone/app/event/profiles/default/types/Plone_Site.xml diff --git a/plone/app/event/profiles/testing/metadata.xml b/src/plone/app/event/profiles/testing/metadata.xml similarity index 100% rename from plone/app/event/profiles/testing/metadata.xml rename to src/plone/app/event/profiles/testing/metadata.xml diff --git a/plone/app/event/profiles/testing/types.xml b/src/plone/app/event/profiles/testing/types.xml similarity index 100% rename from plone/app/event/profiles/testing/types.xml rename to src/plone/app/event/profiles/testing/types.xml diff --git a/plone/app/event/profiles/testing/types/plone.app.event.dx.event.xml b/src/plone/app/event/profiles/testing/types/plone.app.event.dx.event.xml similarity index 100% rename from plone/app/event/profiles/testing/types/plone.app.event.dx.event.xml rename to src/plone/app/event/profiles/testing/types/plone.app.event.dx.event.xml diff --git a/plone/app/event/recurrence.py b/src/plone/app/event/recurrence.py similarity index 100% rename from plone/app/event/recurrence.py rename to src/plone/app/event/recurrence.py diff --git a/plone/app/event/recurrence.zcml b/src/plone/app/event/recurrence.zcml similarity index 100% rename from plone/app/event/recurrence.zcml rename to src/plone/app/event/recurrence.zcml diff --git a/plone/app/event/setuphandlers.py b/src/plone/app/event/setuphandlers.py similarity index 100% rename from plone/app/event/setuphandlers.py rename to src/plone/app/event/setuphandlers.py diff --git a/plone/app/event/testing.py b/src/plone/app/event/testing.py similarity index 100% rename from plone/app/event/testing.py rename to src/plone/app/event/testing.py diff --git a/plone/app/event/tests/INACTIVE_test_robot.py b/src/plone/app/event/tests/INACTIVE_test_robot.py similarity index 100% rename from plone/app/event/tests/INACTIVE_test_robot.py rename to src/plone/app/event/tests/INACTIVE_test_robot.py diff --git a/plone/app/event/tests/__init__.py b/src/plone/app/event/tests/__init__.py similarity index 100% rename from plone/app/event/tests/__init__.py rename to src/plone/app/event/tests/__init__.py diff --git a/plone/app/event/tests/base_setup.py b/src/plone/app/event/tests/base_setup.py similarity index 100% rename from plone/app/event/tests/base_setup.py rename to src/plone/app/event/tests/base_setup.py diff --git a/plone/app/event/tests/icaltest.ics b/src/plone/app/event/tests/icaltest.ics similarity index 100% rename from plone/app/event/tests/icaltest.ics rename to src/plone/app/event/tests/icaltest.ics diff --git a/plone/app/event/tests/icaltest2.ics b/src/plone/app/event/tests/icaltest2.ics similarity index 100% rename from plone/app/event/tests/icaltest2.ics rename to src/plone/app/event/tests/icaltest2.ics diff --git a/plone/app/event/tests/javascripts/test_event.html b/src/plone/app/event/tests/javascripts/test_event.html similarity index 100% rename from plone/app/event/tests/javascripts/test_event.html rename to src/plone/app/event/tests/javascripts/test_event.html diff --git a/plone/app/event/tests/javascripts/test_event.js b/src/plone/app/event/tests/javascripts/test_event.js similarity index 100% rename from plone/app/event/tests/javascripts/test_event.js rename to src/plone/app/event/tests/javascripts/test_event.js diff --git a/plone/app/event/tests/qunit/qunit.css b/src/plone/app/event/tests/qunit/qunit.css similarity index 100% rename from plone/app/event/tests/qunit/qunit.css rename to src/plone/app/event/tests/qunit/qunit.css diff --git a/plone/app/event/tests/qunit/qunit.js b/src/plone/app/event/tests/qunit/qunit.js similarity index 100% rename from plone/app/event/tests/qunit/qunit.js rename to src/plone/app/event/tests/qunit/qunit.js diff --git a/plone/app/event/tests/robot/test_event_roundtrip.robot b/src/plone/app/event/tests/robot/test_event_roundtrip.robot similarity index 100% rename from plone/app/event/tests/robot/test_event_roundtrip.robot rename to src/plone/app/event/tests/robot/test_event_roundtrip.robot diff --git a/plone/app/event/tests/robot/variables.py b/src/plone/app/event/tests/robot/variables.py similarity index 100% rename from plone/app/event/tests/robot/variables.py rename to src/plone/app/event/tests/robot/variables.py diff --git a/plone/app/event/tests/test_base_module.py b/src/plone/app/event/tests/test_base_module.py similarity index 100% rename from plone/app/event/tests/test_base_module.py rename to src/plone/app/event/tests/test_base_module.py diff --git a/plone/app/event/tests/test_catalog.py b/src/plone/app/event/tests/test_catalog.py similarity index 100% rename from plone/app/event/tests/test_catalog.py rename to src/plone/app/event/tests/test_catalog.py diff --git a/plone/app/event/tests/test_dx_behaviors.py b/src/plone/app/event/tests/test_dx_behaviors.py similarity index 100% rename from plone/app/event/tests/test_dx_behaviors.py rename to src/plone/app/event/tests/test_dx_behaviors.py diff --git a/plone/app/event/tests/test_event_listing.py b/src/plone/app/event/tests/test_event_listing.py similarity index 100% rename from plone/app/event/tests/test_event_listing.py rename to src/plone/app/event/tests/test_event_listing.py diff --git a/plone/app/event/tests/test_event_summary.py b/src/plone/app/event/tests/test_event_summary.py similarity index 100% rename from plone/app/event/tests/test_event_summary.py rename to src/plone/app/event/tests/test_event_summary.py diff --git a/plone/app/event/tests/test_event_view.py b/src/plone/app/event/tests/test_event_view.py similarity index 100% rename from plone/app/event/tests/test_event_view.py rename to src/plone/app/event/tests/test_event_view.py diff --git a/plone/app/event/tests/test_ical_import.py b/src/plone/app/event/tests/test_ical_import.py similarity index 100% rename from plone/app/event/tests/test_ical_import.py rename to src/plone/app/event/tests/test_ical_import.py diff --git a/plone/app/event/tests/test_icalendar.py b/src/plone/app/event/tests/test_icalendar.py similarity index 100% rename from plone/app/event/tests/test_icalendar.py rename to src/plone/app/event/tests/test_icalendar.py diff --git a/plone/app/event/tests/test_portlet_calendar.py b/src/plone/app/event/tests/test_portlet_calendar.py similarity index 100% rename from plone/app/event/tests/test_portlet_calendar.py rename to src/plone/app/event/tests/test_portlet_calendar.py diff --git a/plone/app/event/tests/test_portlet_events.py b/src/plone/app/event/tests/test_portlet_events.py similarity index 100% rename from plone/app/event/tests/test_portlet_events.py rename to src/plone/app/event/tests/test_portlet_events.py diff --git a/plone/app/event/tests/test_recurrence.py b/src/plone/app/event/tests/test_recurrence.py similarity index 100% rename from plone/app/event/tests/test_recurrence.py rename to src/plone/app/event/tests/test_recurrence.py diff --git a/plone/app/event/tests/test_search.py b/src/plone/app/event/tests/test_search.py similarity index 100% rename from plone/app/event/tests/test_search.py rename to src/plone/app/event/tests/test_search.py diff --git a/plone/app/event/upgrades/__init__.py b/src/plone/app/event/upgrades/__init__.py similarity index 100% rename from plone/app/event/upgrades/__init__.py rename to src/plone/app/event/upgrades/__init__.py diff --git a/plone/app/event/upgrades/configure.zcml b/src/plone/app/event/upgrades/configure.zcml similarity index 100% rename from plone/app/event/upgrades/configure.zcml rename to src/plone/app/event/upgrades/configure.zcml diff --git a/plone/app/event/upgrades/upgrades.py b/src/plone/app/event/upgrades/upgrades.py similarity index 100% rename from plone/app/event/upgrades/upgrades.py rename to src/plone/app/event/upgrades/upgrades.py diff --git a/plone/app/event/vocabularies.py b/src/plone/app/event/vocabularies.py similarity index 100% rename from plone/app/event/vocabularies.py rename to src/plone/app/event/vocabularies.py diff --git a/tox.ini b/tox.ini index 60d323c79..28a1b9cc3 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ deps = zope.testrunner -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = - zope-testrunner --all --test-path={toxinidir} -s plone.app.event {posargs} + zope-testrunner --all --test-path={toxinidir}/src -s plone.app.event {posargs} extras = test @@ -106,7 +106,7 @@ deps = zope.testrunner -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = - coverage run --branch --source plone.app.event {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.event {posargs} + coverage run --branch --source plone.app.event {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir}/src -s plone.app.event {posargs} coverage report -m --format markdown extras = test