Fixed editable install with pip by moving code to src/plone.

See plone/meta#172
plone · Sep 5, 2023 · 0ce2e69 · 0ce2e69
1 parent cd63cff
commit 0ce2e69
Show file tree

Hide file tree

Showing 88 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+Fixed editable install with pip by moving code to ``src/plone``.  [maurits]
diff --git a/setup.py b/setup.py
@@ -38,7 +38,8 @@
     author_email="[email protected]",
     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 → src/plone/__init__.py b/plone/__init__.py → src/plone/__init__.py
diff --git a/plone/app/__init__.py → src/plone/app/__init__.py b/plone/app/__init__.py → src/plone/app/__init__.py
diff --git a/plone/app/event/__init__.py → src/plone/app/event/__init__.py b/plone/app/event/__init__.py → src/plone/app/event/__init__.py
diff --git a/plone/app/event/base.py → src/plone/app/event/base.py b/plone/app/event/base.py → src/plone/app/event/base.py
diff --git a/plone/app/event/browser/__init__.py → src/plone/app/event/browser/__init__.py b/plone/app/event/browser/__init__.py → src/plone/app/event/browser/__init__.py
diff --git a/plone/app/event/browser/configure.zcml → src/plone/app/event/browser/configure.zcml b/plone/app/event/browser/configure.zcml → src/plone/app/event/browser/configure.zcml
diff --git a/plone/app/event/browser/event_listing.pt → src/plone/app/event/browser/event_listing.pt b/plone/app/event/browser/event_listing.pt → src/plone/app/event/browser/event_listing.pt
diff --git a/plone/app/event/browser/event_listing.py → src/plone/app/event/browser/event_listing.py b/plone/app/event/browser/event_listing.py → src/plone/app/event/browser/event_listing.py
diff --git a/plone/app/event/browser/event_summary.pt → src/plone/app/event/browser/event_summary.pt b/plone/app/event/browser/event_summary.pt → src/plone/app/event/browser/event_summary.pt
diff --git a/plone/app/event/browser/event_summary.py → src/plone/app/event/browser/event_summary.py b/plone/app/event/browser/event_summary.py → src/plone/app/event/browser/event_summary.py
diff --git a/plone/app/event/browser/event_view.pt → src/plone/app/event/browser/event_view.pt b/plone/app/event/browser/event_view.pt → src/plone/app/event/browser/event_view.pt
diff --git a/plone/app/event/browser/event_view.py → src/plone/app/event/browser/event_view.py b/plone/app/event/browser/event_view.py → src/plone/app/event/browser/event_view.py
diff --git a/plone/app/event/browser/formatted_date.pt → ...plone/app/event/browser/formatted_date.pt b/plone/app/event/browser/formatted_date.pt → ...plone/app/event/browser/formatted_date.pt
diff --git a/plone/app/event/browser/formatted_date.py → ...plone/app/event/browser/formatted_date.py b/plone/app/event/browser/formatted_date.py → ...plone/app/event/browser/formatted_date.py
diff --git a/...app/event/browser/formatted_start_date.pt → ...app/event/browser/formatted_start_date.pt b/...app/event/browser/formatted_start_date.pt → ...app/event/browser/formatted_start_date.pt
diff --git a/plone/app/event/browser/leadimage_viewlet.py → ...ne/app/event/browser/leadimage_viewlet.py b/plone/app/event/browser/leadimage_viewlet.py → ...ne/app/event/browser/leadimage_viewlet.py
diff --git a/.../app/event/browser/resources/calendar.svg → .../app/event/browser/resources/calendar.svg b/.../app/event/browser/resources/calendar.svg → .../app/event/browser/resources/calendar.svg
diff --git a/plone/app/event/browser/resources/event.js → ...lone/app/event/browser/resources/event.js b/plone/app/event/browser/resources/event.js → ...lone/app/event/browser/resources/event.js
diff --git a/plone/app/event/configure.zcml → src/plone/app/event/configure.zcml b/plone/app/event/configure.zcml → src/plone/app/event/configure.zcml
diff --git a/plone/app/event/dx/__init__.py → src/plone/app/event/dx/__init__.py b/plone/app/event/dx/__init__.py → src/plone/app/event/dx/__init__.py
diff --git a/plone/app/event/dx/behaviors.py → src/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py → src/plone/app/event/dx/behaviors.py
diff --git a/plone/app/event/dx/configure.zcml → src/plone/app/event/dx/configure.zcml b/plone/app/event/dx/configure.zcml → src/plone/app/event/dx/configure.zcml
diff --git a/plone/app/event/dx/ical.zcml → src/plone/app/event/dx/ical.zcml b/plone/app/event/dx/ical.zcml → src/plone/app/event/dx/ical.zcml
diff --git a/plone/app/event/dx/interfaces.py → src/plone/app/event/dx/interfaces.py b/plone/app/event/dx/interfaces.py → src/plone/app/event/dx/interfaces.py
diff --git a/plone/app/event/dx/traverser.py → src/plone/app/event/dx/traverser.py b/plone/app/event/dx/traverser.py → src/plone/app/event/dx/traverser.py
diff --git a/plone/app/event/ical/__init__.py → src/plone/app/event/ical/__init__.py b/plone/app/event/ical/__init__.py → src/plone/app/event/ical/__init__.py
diff --git a/plone/app/event/ical/configure.zcml → src/plone/app/event/ical/configure.zcml b/plone/app/event/ical/configure.zcml → src/plone/app/event/ical/configure.zcml
diff --git a/plone/app/event/ical/exporter.py → src/plone/app/event/ical/exporter.py b/plone/app/event/ical/exporter.py → src/plone/app/event/ical/exporter.py
diff --git a/plone/app/event/ical/importer.py → src/plone/app/event/ical/importer.py b/plone/app/event/ical/importer.py → src/plone/app/event/ical/importer.py
diff --git a/plone/app/event/interfaces.py → src/plone/app/event/interfaces.py b/plone/app/event/interfaces.py → src/plone/app/event/interfaces.py
diff --git a/plone/app/event/permissions.zcml → src/plone/app/event/permissions.zcml b/plone/app/event/permissions.zcml → src/plone/app/event/permissions.zcml
diff --git a/plone/app/event/portlets/__init__.py → src/plone/app/event/portlets/__init__.py b/plone/app/event/portlets/__init__.py → src/plone/app/event/portlets/__init__.py
diff --git a/plone/app/event/portlets/configure.zcml → src/plone/app/event/portlets/configure.zcml b/plone/app/event/portlets/configure.zcml → src/plone/app/event/portlets/configure.zcml
diff --git a/plone/app/event/portlets/portlet_calendar.pt → ...ne/app/event/portlets/portlet_calendar.pt b/plone/app/event/portlets/portlet_calendar.pt → ...ne/app/event/portlets/portlet_calendar.pt
diff --git a/plone/app/event/portlets/portlet_calendar.py → ...ne/app/event/portlets/portlet_calendar.py b/plone/app/event/portlets/portlet_calendar.py → ...ne/app/event/portlets/portlet_calendar.py
diff --git a/plone/app/event/portlets/portlet_events.pt → ...lone/app/event/portlets/portlet_events.pt b/plone/app/event/portlets/portlet_events.pt → ...lone/app/event/portlets/portlet_events.pt
diff --git a/plone/app/event/portlets/portlet_events.py → ...lone/app/event/portlets/portlet_events.py b/plone/app/event/portlets/portlet_events.py → ...lone/app/event/portlets/portlet_events.py
diff --git a/plone/app/event/profiles/default/actions.xml → ...ne/app/event/profiles/default/actions.xml b/plone/app/event/profiles/default/actions.xml → ...ne/app/event/profiles/default/actions.xml
diff --git a/...p/event/profiles/default/browserlayer.xml → ...p/event/profiles/default/browserlayer.xml b/...p/event/profiles/default/browserlayer.xml → ...p/event/profiles/default/browserlayer.xml
diff --git a/...p/event/profiles/default/controlpanel.xml → ...p/event/profiles/default/controlpanel.xml b/...p/event/profiles/default/controlpanel.xml → ...p/event/profiles/default/controlpanel.xml
diff --git a/...e/app/event/profiles/default/metadata.xml → ...e/app/event/profiles/default/metadata.xml b/...e/app/event/profiles/default/metadata.xml → ...e/app/event/profiles/default/metadata.xml
diff --git a/...files/default/plone.app.event-default.txt → ...files/default/plone.app.event-default.txt b/...files/default/plone.app.event-default.txt → ...files/default/plone.app.event-default.txt
diff --git a/...e/app/event/profiles/default/portlets.xml → ...e/app/event/profiles/default/portlets.xml b/...e/app/event/profiles/default/portlets.xml → ...e/app/event/profiles/default/portlets.xml
diff --git a/...e/app/event/profiles/default/registry.xml → ...e/app/event/profiles/default/registry.xml b/...e/app/event/profiles/default/registry.xml → ...e/app/event/profiles/default/registry.xml
diff --git a/plone/app/event/profiles/default/rolemap.xml → ...ne/app/event/profiles/default/rolemap.xml b/plone/app/event/profiles/default/rolemap.xml → ...ne/app/event/profiles/default/rolemap.xml
diff --git a/plone/app/event/profiles/default/types.xml → ...lone/app/event/profiles/default/types.xml b/plone/app/event/profiles/default/types.xml → ...lone/app/event/profiles/default/types.xml
diff --git a/...ent/profiles/default/types/Collection.xml → ...ent/profiles/default/types/Collection.xml b/...ent/profiles/default/types/Collection.xml → ...ent/profiles/default/types/Collection.xml
diff --git a/...p/event/profiles/default/types/Folder.xml → ...p/event/profiles/default/types/Folder.xml b/...p/event/profiles/default/types/Folder.xml → ...p/event/profiles/default/types/Folder.xml
diff --git a/...ent/profiles/default/types/Plone_Site.xml → ...ent/profiles/default/types/Plone_Site.xml b/...ent/profiles/default/types/Plone_Site.xml → ...ent/profiles/default/types/Plone_Site.xml
diff --git a/...e/app/event/profiles/testing/metadata.xml → ...e/app/event/profiles/testing/metadata.xml b/...e/app/event/profiles/testing/metadata.xml → ...e/app/event/profiles/testing/metadata.xml
diff --git a/plone/app/event/profiles/testing/types.xml → ...lone/app/event/profiles/testing/types.xml b/plone/app/event/profiles/testing/types.xml → ...lone/app/event/profiles/testing/types.xml
diff --git a/...esting/types/plone.app.event.dx.event.xml → ...esting/types/plone.app.event.dx.event.xml b/...esting/types/plone.app.event.dx.event.xml → ...esting/types/plone.app.event.dx.event.xml
diff --git a/plone/app/event/recurrence.py → src/plone/app/event/recurrence.py b/plone/app/event/recurrence.py → src/plone/app/event/recurrence.py
diff --git a/plone/app/event/recurrence.zcml → src/plone/app/event/recurrence.zcml b/plone/app/event/recurrence.zcml → src/plone/app/event/recurrence.zcml
diff --git a/plone/app/event/setuphandlers.py → src/plone/app/event/setuphandlers.py b/plone/app/event/setuphandlers.py → src/plone/app/event/setuphandlers.py
diff --git a/plone/app/event/testing.py → src/plone/app/event/testing.py b/plone/app/event/testing.py → src/plone/app/event/testing.py
diff --git a/plone/app/event/tests/INACTIVE_test_robot.py → ...ne/app/event/tests/INACTIVE_test_robot.py b/plone/app/event/tests/INACTIVE_test_robot.py → ...ne/app/event/tests/INACTIVE_test_robot.py
diff --git a/plone/app/event/tests/__init__.py → src/plone/app/event/tests/__init__.py b/plone/app/event/tests/__init__.py → src/plone/app/event/tests/__init__.py
diff --git a/plone/app/event/tests/base_setup.py → src/plone/app/event/tests/base_setup.py b/plone/app/event/tests/base_setup.py → src/plone/app/event/tests/base_setup.py
diff --git a/plone/app/event/tests/icaltest.ics → src/plone/app/event/tests/icaltest.ics b/plone/app/event/tests/icaltest.ics → src/plone/app/event/tests/icaltest.ics
diff --git a/plone/app/event/tests/icaltest2.ics → src/plone/app/event/tests/icaltest2.ics b/plone/app/event/tests/icaltest2.ics → src/plone/app/event/tests/icaltest2.ics
diff --git a/...p/event/tests/javascripts/test_event.html → ...p/event/tests/javascripts/test_event.html b/...p/event/tests/javascripts/test_event.html → ...p/event/tests/javascripts/test_event.html
diff --git a/...app/event/tests/javascripts/test_event.js → ...app/event/tests/javascripts/test_event.js b/...app/event/tests/javascripts/test_event.js → ...app/event/tests/javascripts/test_event.js
diff --git a/plone/app/event/tests/qunit/qunit.css → src/plone/app/event/tests/qunit/qunit.css b/plone/app/event/tests/qunit/qunit.css → src/plone/app/event/tests/qunit/qunit.css
diff --git a/plone/app/event/tests/qunit/qunit.js → src/plone/app/event/tests/qunit/qunit.js b/plone/app/event/tests/qunit/qunit.js → src/plone/app/event/tests/qunit/qunit.js
diff --git a/...nt/tests/robot/test_event_roundtrip.robot → ...nt/tests/robot/test_event_roundtrip.robot b/...nt/tests/robot/test_event_roundtrip.robot → ...nt/tests/robot/test_event_roundtrip.robot
diff --git a/plone/app/event/tests/robot/variables.py → src/plone/app/event/tests/robot/variables.py b/plone/app/event/tests/robot/variables.py → src/plone/app/event/tests/robot/variables.py
diff --git a/plone/app/event/tests/test_base_module.py → ...plone/app/event/tests/test_base_module.py b/plone/app/event/tests/test_base_module.py → ...plone/app/event/tests/test_base_module.py
diff --git a/plone/app/event/tests/test_catalog.py → src/plone/app/event/tests/test_catalog.py b/plone/app/event/tests/test_catalog.py → src/plone/app/event/tests/test_catalog.py
diff --git a/plone/app/event/tests/test_dx_behaviors.py → ...lone/app/event/tests/test_dx_behaviors.py b/plone/app/event/tests/test_dx_behaviors.py → ...lone/app/event/tests/test_dx_behaviors.py
diff --git a/plone/app/event/tests/test_event_listing.py → ...one/app/event/tests/test_event_listing.py b/plone/app/event/tests/test_event_listing.py → ...one/app/event/tests/test_event_listing.py
diff --git a/plone/app/event/tests/test_event_summary.py → ...one/app/event/tests/test_event_summary.py b/plone/app/event/tests/test_event_summary.py → ...one/app/event/tests/test_event_summary.py
diff --git a/plone/app/event/tests/test_event_view.py → src/plone/app/event/tests/test_event_view.py b/plone/app/event/tests/test_event_view.py → src/plone/app/event/tests/test_event_view.py
diff --git a/plone/app/event/tests/test_ical_import.py → ...plone/app/event/tests/test_ical_import.py b/plone/app/event/tests/test_ical_import.py → ...plone/app/event/tests/test_ical_import.py
diff --git a/plone/app/event/tests/test_icalendar.py → src/plone/app/event/tests/test_icalendar.py b/plone/app/event/tests/test_icalendar.py → src/plone/app/event/tests/test_icalendar.py
diff --git a/.../app/event/tests/test_portlet_calendar.py → .../app/event/tests/test_portlet_calendar.py b/.../app/event/tests/test_portlet_calendar.py → .../app/event/tests/test_portlet_calendar.py
diff --git a/plone/app/event/tests/test_portlet_events.py → ...ne/app/event/tests/test_portlet_events.py b/plone/app/event/tests/test_portlet_events.py → ...ne/app/event/tests/test_portlet_events.py
diff --git a/plone/app/event/tests/test_recurrence.py → src/plone/app/event/tests/test_recurrence.py b/plone/app/event/tests/test_recurrence.py → src/plone/app/event/tests/test_recurrence.py
diff --git a/plone/app/event/tests/test_search.py → src/plone/app/event/tests/test_search.py b/plone/app/event/tests/test_search.py → src/plone/app/event/tests/test_search.py
diff --git a/plone/app/event/upgrades/__init__.py → src/plone/app/event/upgrades/__init__.py b/plone/app/event/upgrades/__init__.py → src/plone/app/event/upgrades/__init__.py
diff --git a/plone/app/event/upgrades/configure.zcml → src/plone/app/event/upgrades/configure.zcml b/plone/app/event/upgrades/configure.zcml → src/plone/app/event/upgrades/configure.zcml
diff --git a/plone/app/event/upgrades/upgrades.py → src/plone/app/event/upgrades/upgrades.py b/plone/app/event/upgrades/upgrades.py → src/plone/app/event/upgrades/upgrades.py
diff --git a/plone/app/event/vocabularies.py → src/plone/app/event/vocabularies.py b/plone/app/event/vocabularies.py → src/plone/app/event/vocabularies.py
diff --git 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