Skip to content

Commit 09b1da7

Browse files
mauritsvanreesmauritsvanrees
authored
Merge pull request #79 from plone/src-layout
Move to src layout
2 parents 7405822 + 03198d9 commit 09b1da7

File tree

318 files changed

+166
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+166
-82
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
#
55
# EditorConfig Configuration file, for more details see:

‎.flake8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
[flake8]
55
doctests = 1

dependabot.yml renamed to .github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
version: 2
55
updates:

‎.github/workflows/meta.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
name: Meta
55
on:
@@ -25,24 +25,21 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
29-
test:
30-
uses: plone/meta/.github/workflows/test.yml@main
28+
uses: plone/meta/.github/workflows/qa.yml@2.x
3129
coverage:
32-
uses: plone/meta/.github/workflows/coverage.yml@main
30+
uses: plone/meta/.github/workflows/coverage.yml@2.x
3331
dependencies:
34-
uses: plone/meta/.github/workflows/dependencies.yml@main
32+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3533
release_ready:
36-
uses: plone/meta/.github/workflows/release_ready.yml@main
34+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
3735
circular:
38-
uses: plone/meta/.github/workflows/circular.yml@main
36+
uses: plone/meta/.github/workflows/circular.yml@2.x
3937

4038
##
4139
# To modify the list of default jobs being created add in .meta.toml:
4240
# [github]
4341
# jobs = [
4442
# "qa",
45-
# "test",
4643
# "coverage",
4744
# "dependencies",
4845
# "release_ready",
@@ -57,13 +54,6 @@ jobs:
5754
# os_dependencies = "git libxml2 libxslt"
5855
##
5956

60-
##
61-
# To test against a specific matrix of python versions
62-
# when running tests jobs, add in .meta.toml:
63-
# [github]
64-
# py_versions = "['3.12', '3.11']"
65-
##
66-
6757

6858
##
6959
# Specify additional jobs in .meta.toml:

‎.github/workflows/test-matrix.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
name: Tests
5+
6+
on:
7+
push:
8+
9+
jobs:
10+
build:
11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
strategy:
15+
# We want to see all failures:
16+
fail-fast: false
17+
matrix:
18+
os:
19+
- ["ubuntu", "ubuntu-latest"]
20+
config:
21+
# [Python version, visual name, tox env]
22+
- ["3.13", "6.2 on py3.13", "py313-plone62"]
23+
- ["3.10", "6.2 on py3.10", "py310-plone62"]
24+
- ["3.13", "6.1 on py3.13", "py313-plone61"]
25+
- ["3.10", "6.1 on py3.10", "py310-plone61"]
26+
- ["3.9", "6.0 on py3.9", "py39-plone60"]
27+
- ["3.13", "6.0 on py3.13", "py313-plone60"]
28+
29+
runs-on: ${{ matrix.os[1] }}
30+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
31+
name: ${{ matrix.config[1] }}
32+
steps:
33+
- uses: actions/checkout@v5
34+
with:
35+
persist-credentials: false
36+
- name: Set up Python
37+
uses: actions/setup-python@v6
38+
with:
39+
python-version: ${{ matrix.config[0] }}
40+
allow-prereleases: true
41+
- name: Pip cache
42+
uses: actions/cache@v4
43+
with:
44+
path: ~/.cache/pip
45+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
46+
restore-keys: |
47+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
48+
${{ runner.os }}-pip-
49+
- name: Install dependencies
50+
run: |
51+
python -m pip install --upgrade pip
52+
pip install tox
53+
- name: Initialize tox
54+
# the bash one-liner below does not work on Windows
55+
if: contains(matrix.os, 'ubuntu')
56+
run: |
57+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
58+
- name: Test
59+
run: tox -e ${{ matrix.config[2] }}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
# python related
55
*.egg-info
@@ -20,6 +20,8 @@ __pycache__/
2020
.tox
2121
.vscode/
2222
node_modules/
23+
forest.dot
24+
forest.json
2325

2426
# venv / buildout related
2527
bin/

‎.meta.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
[meta]
55
template = "default"
6-
commit-id = "a89af8f2"
6+
commit-id = "2.0.1.dev0"
77

88
[pyproject]
99
codespell_ignores = "fo,nam,nd,te,ue"

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
ci:
55
autofix_prs: false

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include *.rst
22

33
recursive-include docs *
4-
recursive-include plone *
4+
recursive-include src *
55

66
global-exclude *.pyc
77
include pyproject.toml

‎news/4217.internal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move distribution to src layout [gforcada]

0 commit comments

Comments
 (0)