From 444fc1f665b66785a128770543bdcde961b38834 Mon Sep 17 00:00:00 2001 From: Jon Pentland Date: Mon, 31 Mar 2025 13:45:55 +0100 Subject: [PATCH] Switch to src package directory layout --- MANIFEST.in | 2 +- setup.py | 5 +++-- {plone => src/plone}/__init__.py | 0 {plone => src/plone}/namedfile/__init__.py | 0 {plone => src/plone}/namedfile/adapters.py | 0 {plone => src/plone}/namedfile/browser.py | 0 {plone => src/plone}/namedfile/configure.zcml | 0 {plone => src/plone}/namedfile/copy.py | 0 {plone => src/plone}/namedfile/editor.py | 0 {plone => src/plone}/namedfile/editor.zcml | 0 {plone => src/plone}/namedfile/field.py | 0 {plone => src/plone}/namedfile/field.zcml | 0 {plone => src/plone}/namedfile/file.py | 0 {plone => src/plone}/namedfile/handler.py | 0 {plone => src/plone}/namedfile/handler.rst | 0 {plone => src/plone}/namedfile/handler.zcml | 0 {plone => src/plone}/namedfile/interfaces.py | 0 {plone => src/plone}/namedfile/marshaler.py | 0 {plone => src/plone}/namedfile/marshaler.rst | 0 {plone => src/plone}/namedfile/marshaler.zcml | 0 {plone => src/plone}/namedfile/picture.py | 0 {plone => src/plone}/namedfile/scaling.py | 0 {plone => src/plone}/namedfile/scaling.zcml | 0 {plone => src/plone}/namedfile/storages.py | 0 {plone => src/plone}/namedfile/test.pt | 0 {plone => src/plone}/namedfile/testing.py | 0 {plone => src/plone}/namedfile/testing.zcml | 0 {plone => src/plone}/namedfile/tests/900.jpg | Bin {plone => src/plone}/namedfile/tests/__init__.py | 0 {plone => src/plone}/namedfile/tests/dummy.py | 0 {plone => src/plone}/namedfile/tests/file.pdf | Bin {plone => src/plone}/namedfile/tests/image.gif | Bin {plone => src/plone}/namedfile/tests/image.jpg | Bin {plone => src/plone}/namedfile/tests/image.png | Bin {plone => src/plone}/namedfile/tests/image.svg | 0 {plone => src/plone}/namedfile/tests/image.tif | Bin .../plone}/namedfile/tests/image_large_header.svg | 0 {plone => src/plone}/namedfile/tests/notimage.doc | Bin .../plone}/namedfile/tests/test_adapters.py | 0 .../plone}/namedfile/tests/test_blobfile.py | 0 .../plone}/namedfile/tests/test_display_file.py | 0 .../plone}/namedfile/tests/test_doctests.py | 0 {plone => src/plone}/namedfile/tests/test_image.py | 0 .../plone}/namedfile/tests/test_scaling.py | 0 .../namedfile/tests/test_scaling_functional.py | 0 .../plone}/namedfile/tests/test_storable.py | 0 {plone => src/plone}/namedfile/tests/test_svg.py | 0 {plone => src/plone}/namedfile/tests/test_utils.py | 0 .../plone}/namedfile/tests/test_validation.py | 0 {plone => src/plone}/namedfile/tests/tool.gif | Bin {plone => src/plone}/namedfile/usage.rst | 0 {plone => src/plone}/namedfile/utils.rst | 0 {plone => src/plone}/namedfile/utils/__init__.py | 0 {plone => src/plone}/namedfile/utils/jpeg_utils.py | 0 {plone => src/plone}/namedfile/utils/png_utils.py | 0 {plone => src/plone}/namedfile/utils/svg_utils.py | 0 {plone => src/plone}/namedfile/z3c-blobfile.zcml | 0 57 files changed, 4 insertions(+), 3 deletions(-) rename {plone => src/plone}/__init__.py (100%) rename {plone => src/plone}/namedfile/__init__.py (100%) rename {plone => src/plone}/namedfile/adapters.py (100%) rename {plone => src/plone}/namedfile/browser.py (100%) rename {plone => src/plone}/namedfile/configure.zcml (100%) rename {plone => src/plone}/namedfile/copy.py (100%) rename {plone => src/plone}/namedfile/editor.py (100%) rename {plone => src/plone}/namedfile/editor.zcml (100%) rename {plone => src/plone}/namedfile/field.py (100%) rename {plone => src/plone}/namedfile/field.zcml (100%) rename {plone => src/plone}/namedfile/file.py (100%) rename {plone => src/plone}/namedfile/handler.py (100%) rename {plone => src/plone}/namedfile/handler.rst (100%) rename {plone => src/plone}/namedfile/handler.zcml (100%) rename {plone => src/plone}/namedfile/interfaces.py (100%) rename {plone => src/plone}/namedfile/marshaler.py (100%) rename {plone => src/plone}/namedfile/marshaler.rst (100%) rename {plone => src/plone}/namedfile/marshaler.zcml (100%) rename {plone => src/plone}/namedfile/picture.py (100%) rename {plone => src/plone}/namedfile/scaling.py (100%) rename {plone => src/plone}/namedfile/scaling.zcml (100%) rename {plone => src/plone}/namedfile/storages.py (100%) rename {plone => src/plone}/namedfile/test.pt (100%) rename {plone => src/plone}/namedfile/testing.py (100%) rename {plone => src/plone}/namedfile/testing.zcml (100%) rename {plone => src/plone}/namedfile/tests/900.jpg (100%) rename {plone => src/plone}/namedfile/tests/__init__.py (100%) rename {plone => src/plone}/namedfile/tests/dummy.py (100%) rename {plone => src/plone}/namedfile/tests/file.pdf (100%) rename {plone => src/plone}/namedfile/tests/image.gif (100%) rename {plone => src/plone}/namedfile/tests/image.jpg (100%) rename {plone => src/plone}/namedfile/tests/image.png (100%) rename {plone => src/plone}/namedfile/tests/image.svg (100%) rename {plone => src/plone}/namedfile/tests/image.tif (100%) rename {plone => src/plone}/namedfile/tests/image_large_header.svg (100%) rename {plone => src/plone}/namedfile/tests/notimage.doc (100%) rename {plone => src/plone}/namedfile/tests/test_adapters.py (100%) rename {plone => src/plone}/namedfile/tests/test_blobfile.py (100%) rename {plone => src/plone}/namedfile/tests/test_display_file.py (100%) rename {plone => src/plone}/namedfile/tests/test_doctests.py (100%) rename {plone => src/plone}/namedfile/tests/test_image.py (100%) rename {plone => src/plone}/namedfile/tests/test_scaling.py (100%) rename {plone => src/plone}/namedfile/tests/test_scaling_functional.py (100%) rename {plone => src/plone}/namedfile/tests/test_storable.py (100%) rename {plone => src/plone}/namedfile/tests/test_svg.py (100%) rename {plone => src/plone}/namedfile/tests/test_utils.py (100%) rename {plone => src/plone}/namedfile/tests/test_validation.py (100%) rename {plone => src/plone}/namedfile/tests/tool.gif (100%) rename {plone => src/plone}/namedfile/usage.rst (100%) rename {plone => src/plone}/namedfile/utils.rst (100%) rename {plone => src/plone}/namedfile/utils/__init__.py (100%) rename {plone => src/plone}/namedfile/utils/jpeg_utils.py (100%) rename {plone => src/plone}/namedfile/utils/png_utils.py (100%) rename {plone => src/plone}/namedfile/utils/svg_utils.py (100%) rename {plone => src/plone}/namedfile/z3c-blobfile.zcml (100%) diff --git a/MANIFEST.in b/MANIFEST.in index a8a4219f..0a3e1f11 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include *.rst graft docs -graft plone +graft src global-exclude *.py[co] include pyproject.toml diff --git a/setup.py b/setup.py index c35a6ae6..b875ede3 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ [ open("README.rst").read(), open("CHANGES.rst").read(), - open(os.path.join("plone", "namedfile", "usage.rst")).read(), + open(os.path.join("src", "plone", "namedfile", "usage.rst")).read(), ] ) @@ -41,7 +41,8 @@ author_email="plone-developers@lists.sourceforge.net", url="https://pypi.org/project/plone.namedfile", license="BSD", - packages=find_packages(), + packages=find_packages('src'), + package_dir={"": "src"}, namespace_packages=["plone"], include_package_data=True, zip_safe=False, 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/namedfile/__init__.py b/src/plone/namedfile/__init__.py similarity index 100% rename from plone/namedfile/__init__.py rename to src/plone/namedfile/__init__.py diff --git a/plone/namedfile/adapters.py b/src/plone/namedfile/adapters.py similarity index 100% rename from plone/namedfile/adapters.py rename to src/plone/namedfile/adapters.py diff --git a/plone/namedfile/browser.py b/src/plone/namedfile/browser.py similarity index 100% rename from plone/namedfile/browser.py rename to src/plone/namedfile/browser.py diff --git a/plone/namedfile/configure.zcml b/src/plone/namedfile/configure.zcml similarity index 100% rename from plone/namedfile/configure.zcml rename to src/plone/namedfile/configure.zcml diff --git a/plone/namedfile/copy.py b/src/plone/namedfile/copy.py similarity index 100% rename from plone/namedfile/copy.py rename to src/plone/namedfile/copy.py diff --git a/plone/namedfile/editor.py b/src/plone/namedfile/editor.py similarity index 100% rename from plone/namedfile/editor.py rename to src/plone/namedfile/editor.py diff --git a/plone/namedfile/editor.zcml b/src/plone/namedfile/editor.zcml similarity index 100% rename from plone/namedfile/editor.zcml rename to src/plone/namedfile/editor.zcml diff --git a/plone/namedfile/field.py b/src/plone/namedfile/field.py similarity index 100% rename from plone/namedfile/field.py rename to src/plone/namedfile/field.py diff --git a/plone/namedfile/field.zcml b/src/plone/namedfile/field.zcml similarity index 100% rename from plone/namedfile/field.zcml rename to src/plone/namedfile/field.zcml diff --git a/plone/namedfile/file.py b/src/plone/namedfile/file.py similarity index 100% rename from plone/namedfile/file.py rename to src/plone/namedfile/file.py diff --git a/plone/namedfile/handler.py b/src/plone/namedfile/handler.py similarity index 100% rename from plone/namedfile/handler.py rename to src/plone/namedfile/handler.py diff --git a/plone/namedfile/handler.rst b/src/plone/namedfile/handler.rst similarity index 100% rename from plone/namedfile/handler.rst rename to src/plone/namedfile/handler.rst diff --git a/plone/namedfile/handler.zcml b/src/plone/namedfile/handler.zcml similarity index 100% rename from plone/namedfile/handler.zcml rename to src/plone/namedfile/handler.zcml diff --git a/plone/namedfile/interfaces.py b/src/plone/namedfile/interfaces.py similarity index 100% rename from plone/namedfile/interfaces.py rename to src/plone/namedfile/interfaces.py diff --git a/plone/namedfile/marshaler.py b/src/plone/namedfile/marshaler.py similarity index 100% rename from plone/namedfile/marshaler.py rename to src/plone/namedfile/marshaler.py diff --git a/plone/namedfile/marshaler.rst b/src/plone/namedfile/marshaler.rst similarity index 100% rename from plone/namedfile/marshaler.rst rename to src/plone/namedfile/marshaler.rst diff --git a/plone/namedfile/marshaler.zcml b/src/plone/namedfile/marshaler.zcml similarity index 100% rename from plone/namedfile/marshaler.zcml rename to src/plone/namedfile/marshaler.zcml diff --git a/plone/namedfile/picture.py b/src/plone/namedfile/picture.py similarity index 100% rename from plone/namedfile/picture.py rename to src/plone/namedfile/picture.py diff --git a/plone/namedfile/scaling.py b/src/plone/namedfile/scaling.py similarity index 100% rename from plone/namedfile/scaling.py rename to src/plone/namedfile/scaling.py diff --git a/plone/namedfile/scaling.zcml b/src/plone/namedfile/scaling.zcml similarity index 100% rename from plone/namedfile/scaling.zcml rename to src/plone/namedfile/scaling.zcml diff --git a/plone/namedfile/storages.py b/src/plone/namedfile/storages.py similarity index 100% rename from plone/namedfile/storages.py rename to src/plone/namedfile/storages.py diff --git a/plone/namedfile/test.pt b/src/plone/namedfile/test.pt similarity index 100% rename from plone/namedfile/test.pt rename to src/plone/namedfile/test.pt diff --git a/plone/namedfile/testing.py b/src/plone/namedfile/testing.py similarity index 100% rename from plone/namedfile/testing.py rename to src/plone/namedfile/testing.py diff --git a/plone/namedfile/testing.zcml b/src/plone/namedfile/testing.zcml similarity index 100% rename from plone/namedfile/testing.zcml rename to src/plone/namedfile/testing.zcml diff --git a/plone/namedfile/tests/900.jpg b/src/plone/namedfile/tests/900.jpg similarity index 100% rename from plone/namedfile/tests/900.jpg rename to src/plone/namedfile/tests/900.jpg diff --git a/plone/namedfile/tests/__init__.py b/src/plone/namedfile/tests/__init__.py similarity index 100% rename from plone/namedfile/tests/__init__.py rename to src/plone/namedfile/tests/__init__.py diff --git a/plone/namedfile/tests/dummy.py b/src/plone/namedfile/tests/dummy.py similarity index 100% rename from plone/namedfile/tests/dummy.py rename to src/plone/namedfile/tests/dummy.py diff --git a/plone/namedfile/tests/file.pdf b/src/plone/namedfile/tests/file.pdf similarity index 100% rename from plone/namedfile/tests/file.pdf rename to src/plone/namedfile/tests/file.pdf diff --git a/plone/namedfile/tests/image.gif b/src/plone/namedfile/tests/image.gif similarity index 100% rename from plone/namedfile/tests/image.gif rename to src/plone/namedfile/tests/image.gif diff --git a/plone/namedfile/tests/image.jpg b/src/plone/namedfile/tests/image.jpg similarity index 100% rename from plone/namedfile/tests/image.jpg rename to src/plone/namedfile/tests/image.jpg diff --git a/plone/namedfile/tests/image.png b/src/plone/namedfile/tests/image.png similarity index 100% rename from plone/namedfile/tests/image.png rename to src/plone/namedfile/tests/image.png diff --git a/plone/namedfile/tests/image.svg b/src/plone/namedfile/tests/image.svg similarity index 100% rename from plone/namedfile/tests/image.svg rename to src/plone/namedfile/tests/image.svg diff --git a/plone/namedfile/tests/image.tif b/src/plone/namedfile/tests/image.tif similarity index 100% rename from plone/namedfile/tests/image.tif rename to src/plone/namedfile/tests/image.tif diff --git a/plone/namedfile/tests/image_large_header.svg b/src/plone/namedfile/tests/image_large_header.svg similarity index 100% rename from plone/namedfile/tests/image_large_header.svg rename to src/plone/namedfile/tests/image_large_header.svg diff --git a/plone/namedfile/tests/notimage.doc b/src/plone/namedfile/tests/notimage.doc similarity index 100% rename from plone/namedfile/tests/notimage.doc rename to src/plone/namedfile/tests/notimage.doc diff --git a/plone/namedfile/tests/test_adapters.py b/src/plone/namedfile/tests/test_adapters.py similarity index 100% rename from plone/namedfile/tests/test_adapters.py rename to src/plone/namedfile/tests/test_adapters.py diff --git a/plone/namedfile/tests/test_blobfile.py b/src/plone/namedfile/tests/test_blobfile.py similarity index 100% rename from plone/namedfile/tests/test_blobfile.py rename to src/plone/namedfile/tests/test_blobfile.py diff --git a/plone/namedfile/tests/test_display_file.py b/src/plone/namedfile/tests/test_display_file.py similarity index 100% rename from plone/namedfile/tests/test_display_file.py rename to src/plone/namedfile/tests/test_display_file.py diff --git a/plone/namedfile/tests/test_doctests.py b/src/plone/namedfile/tests/test_doctests.py similarity index 100% rename from plone/namedfile/tests/test_doctests.py rename to src/plone/namedfile/tests/test_doctests.py diff --git a/plone/namedfile/tests/test_image.py b/src/plone/namedfile/tests/test_image.py similarity index 100% rename from plone/namedfile/tests/test_image.py rename to src/plone/namedfile/tests/test_image.py diff --git a/plone/namedfile/tests/test_scaling.py b/src/plone/namedfile/tests/test_scaling.py similarity index 100% rename from plone/namedfile/tests/test_scaling.py rename to src/plone/namedfile/tests/test_scaling.py diff --git a/plone/namedfile/tests/test_scaling_functional.py b/src/plone/namedfile/tests/test_scaling_functional.py similarity index 100% rename from plone/namedfile/tests/test_scaling_functional.py rename to src/plone/namedfile/tests/test_scaling_functional.py diff --git a/plone/namedfile/tests/test_storable.py b/src/plone/namedfile/tests/test_storable.py similarity index 100% rename from plone/namedfile/tests/test_storable.py rename to src/plone/namedfile/tests/test_storable.py diff --git a/plone/namedfile/tests/test_svg.py b/src/plone/namedfile/tests/test_svg.py similarity index 100% rename from plone/namedfile/tests/test_svg.py rename to src/plone/namedfile/tests/test_svg.py diff --git a/plone/namedfile/tests/test_utils.py b/src/plone/namedfile/tests/test_utils.py similarity index 100% rename from plone/namedfile/tests/test_utils.py rename to src/plone/namedfile/tests/test_utils.py diff --git a/plone/namedfile/tests/test_validation.py b/src/plone/namedfile/tests/test_validation.py similarity index 100% rename from plone/namedfile/tests/test_validation.py rename to src/plone/namedfile/tests/test_validation.py diff --git a/plone/namedfile/tests/tool.gif b/src/plone/namedfile/tests/tool.gif similarity index 100% rename from plone/namedfile/tests/tool.gif rename to src/plone/namedfile/tests/tool.gif diff --git a/plone/namedfile/usage.rst b/src/plone/namedfile/usage.rst similarity index 100% rename from plone/namedfile/usage.rst rename to src/plone/namedfile/usage.rst diff --git a/plone/namedfile/utils.rst b/src/plone/namedfile/utils.rst similarity index 100% rename from plone/namedfile/utils.rst rename to src/plone/namedfile/utils.rst diff --git a/plone/namedfile/utils/__init__.py b/src/plone/namedfile/utils/__init__.py similarity index 100% rename from plone/namedfile/utils/__init__.py rename to src/plone/namedfile/utils/__init__.py diff --git a/plone/namedfile/utils/jpeg_utils.py b/src/plone/namedfile/utils/jpeg_utils.py similarity index 100% rename from plone/namedfile/utils/jpeg_utils.py rename to src/plone/namedfile/utils/jpeg_utils.py diff --git a/plone/namedfile/utils/png_utils.py b/src/plone/namedfile/utils/png_utils.py similarity index 100% rename from plone/namedfile/utils/png_utils.py rename to src/plone/namedfile/utils/png_utils.py diff --git a/plone/namedfile/utils/svg_utils.py b/src/plone/namedfile/utils/svg_utils.py similarity index 100% rename from plone/namedfile/utils/svg_utils.py rename to src/plone/namedfile/utils/svg_utils.py diff --git a/plone/namedfile/z3c-blobfile.zcml b/src/plone/namedfile/z3c-blobfile.zcml similarity index 100% rename from plone/namedfile/z3c-blobfile.zcml rename to src/plone/namedfile/z3c-blobfile.zcml