Merge pull request #60 from plone/src-layout

Move to src layout

Author: mauritsvanrees

dependabot.yml .github/dependabot.ymldependabot.yml renamed to .github/dependabot.yml

@@ -25,27 +25,21 @@ on:
 
 jobs:
   qa:
-    uses: plone/meta/.github/workflows/qa.yml@main
-  test:
-    uses: plone/meta/.github/workflows/test.yml@main
-    with:
-
-       py-versions: '["3.12", "3.11", "3.10", "3.9", "pypy3.9"]'
+    uses: plone/meta/.github/workflows/qa.yml@2.x
   coverage:
-    uses: plone/meta/.github/workflows/coverage.yml@main
+    uses: plone/meta/.github/workflows/coverage.yml@2.x
   dependencies:
-    uses: plone/meta/.github/workflows/dependencies.yml@main
+    uses: plone/meta/.github/workflows/dependencies.yml@2.x
   release_ready:
-    uses: plone/meta/.github/workflows/release_ready.yml@main
+    uses: plone/meta/.github/workflows/release_ready.yml@2.x
   circular:
-    uses: plone/meta/.github/workflows/circular.yml@main
+    uses: plone/meta/.github/workflows/circular.yml@2.x
 
 ##
 # To modify the list of default jobs being created add in .meta.toml:
 # [github]
 # jobs = [
 #    "qa",
-#    "test",
 #    "coverage",
 #    "dependencies",
 #    "release_ready",
@@ -60,13 +54,6 @@ jobs:
 # os_dependencies = "git libxml2 libxslt"
 ##
 
-##
-# To test against a specific matrix of python versions
-# when running tests jobs, add in .meta.toml:
-# [github]
-# py_versions = "['3.12', '3.11']"
-##
-
 
 ##
 # Specify additional jobs in .meta.toml:

.github/workflows/meta.yml

@@ -0,0 +1,60 @@
+# Generated from:
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# See the inline comments on how to expand/tweak this configuration file
+name: Tests
+
+on:
+  push:
+
+jobs:
+  build:
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      # We want to see all failures:
+      fail-fast: false
+      matrix:
+        os:
+        - ["ubuntu", "ubuntu-latest"]
+        config:
+        # [Python version, visual name, tox env]
+        - ["pypy3.11", "6.2 on pypy3.11", "pypy311-plone62"]
+        - ["3.13", "6.2 on py3.13", "py313-plone62"]
+        - ["3.10", "6.2 on py3.10", "py310-plone62"]
+        - ["3.13", "6.1 on py3.13", "py313-plone61"]
+        - ["3.10", "6.1 on py3.10", "py310-plone61"]
+        - ["3.9", "6.0 on py3.9", "py39-plone60"]
+        - ["3.13", "6.0 on py3.13", "py313-plone60"]
+
+    runs-on: ${{ matrix.os[1] }}
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: ${{ matrix.config[1] }}
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        persist-credentials: false
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.config[0] }}
+        allow-prereleases: true
+    - name: Pip cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.config[0] }}-
+          ${{ runner.os }}-pip-
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Initialize tox
+      # the bash one-liner below does not work on Windows
+      if: contains(matrix.os, 'ubuntu')
+      run: |
+        if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
+    - name: Test
+      run: tox -e ${{ matrix.config[2] }}

.github/workflows/test-matrix.yml

@@ -3,11 +3,11 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "9d225a77"
+commit-id = "2.0.1.dev0"
 
 [pyproject]
 dependencies_ignores = "['zope.testing']"
 codespell_ignores = "whit"
 
-[github]
-py_versions = "[\"3.12\", \"3.11\", \"3.10\", \"3.9\", \"pypy3.9\"]"
+[tox]
+test_matrix = {"6.2" = ["3.13", "3.12", "3.11", "3.10", "pypy3.11"], "6.1" = ["3.13", "3.12", "3.11", "3.10"], "6.0" = ["3.13", "3.12", "3.11", "3.10", "3.9"]}

.meta.toml

@@ -2,7 +2,7 @@ include *.rst
 include pyproject.toml
 
 recursive-include docs *
-recursive-include plone *
+recursive-include src *
 
 global-exclude *pyc
 

MANIFEST.in

@@ -0,0 +1 @@
+Move distribution to src layout [gforcada]

news/4217.internal

@@ -2,7 +2,7 @@
 # https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [build-system]
-requires = ["setuptools>=68.2"]
+requires = ["setuptools>=68.2,<80", "wheel"]
 
 [tool.towncrier]
 directory = "news/"
@@ -37,7 +37,7 @@ showcontent = true
 
 [[tool.towncrier.type]]
 directory = "tests"
-name = "Tests"
+name = "Tests:"
 showcontent = true
 
 ##

pyproject.toml

@@ -7,7 +7,7 @@
 
 long_description = (
     f"{Path('README.rst').read_text()}\n"
-    f"{(Path('plone') / 'memoize' / 'README.rst').read_text()}\n"
+    f"{(Path('src') / 'plone' / 'memoize' / 'README.rst').read_text()}\n"
     f"{Path('CHANGES.rst').read_text()}"
 )
 
@@ -41,8 +41,9 @@
     author_email="plone-developers@lists.sourceforge.net",
     url="https://pypi.org/project/plone.memoize",
     license="BSD",
-    packages=find_packages(),
+    packages=find_packages("src"),
     namespace_packages=["plone"],
+    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
     python_requires=">=3.8",