Skip to content

Commit 58a77ee

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-create
2 parents 3a186b6 + c9a35d7 commit 58a77ee

58 files changed

Lines changed: 1810 additions & 953 deletions

Some content is hidden

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

.editorconfig

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# EditorConfig Configurtaion file, for more details see:
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/config/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
#
5+
# EditorConfig Configuration file, for more details see:
26
# http://EditorConfig.org
37
# EditorConfig is a convention description, that could be interpreted
48
# by multiple editors to enforce common coding conventions for specific
@@ -8,7 +12,9 @@
812
# Will ignore other EditorConfig files in Home directory or upper tree level.
913
root = true
1014

11-
[*] # For All Files
15+
16+
[*]
17+
# Default settings for all files.
1218
# Unix-style newlines with a newline ending every file
1319
end_of_line = lf
1420
insert_final_newline = true
@@ -24,19 +30,27 @@ max_line_length = off
2430
# 4 space indentation
2531
indent_size = 4
2632

27-
[*.{yml}]
33+
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
2834
# 2 space indentation
2935
indent_size = 2
3036

37+
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
38+
# Frontend development
39+
# 2 space indentation
40+
indent_size = 2
41+
max_line_length = 80
42+
3143
[{Makefile,.gitmodules}]
3244
# Tab indentation (no size specified, but view as 4 spaces)
3345
indent_style = tab
3446
indent_size = unset
3547
tab_width = unset
3648

37-
[*.bat]
38-
indent_style = tab
39-
end_of_line = crlf
4049

41-
[LICENSE]
42-
insert_final_newline = false
50+
##
51+
# Add extra configuration options in .meta.toml:
52+
# [editorconfig]
53+
# extra_lines = """
54+
# _your own configuration lines_
55+
# """
56+
##

.flake8

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/config/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
[flake8]
5+
doctests = 1
6+
ignore =
7+
# black takes care of line length
8+
E501,
9+
# black takes care of where to break lines
10+
W503,
11+
# black takes care of spaces within slicing (list[:])
12+
E203,
13+
# black takes care of spaces after commas
14+
E231,
15+
16+
##
17+
# Add extra configuration options in .meta.toml:
18+
# [flake8]
19+
# extra_lines = """
20+
# _your own configuration lines_
21+
# """
22+
##

.github/workflows/black.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
python-version: [3.9]
9+
python-version: [3.11]
1010

1111
steps:
1212
# git checkout
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
# python setup
1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020
- name: Install dependencies
@@ -23,7 +23,7 @@ jobs:
2323
pip install tox tox-gh-actions
2424
2525
# python cache
26-
- uses: actions/cache@v1
26+
- uses: actions/cache@v4
2727
with:
2828
path: ~/.cache/pip
2929
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/isort.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/meta.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/config/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
name: Meta
5+
on:
6+
push:
7+
branches:
8+
- master
9+
- main
10+
pull_request:
11+
branches:
12+
- master
13+
- main
14+
workflow_dispatch:
15+
16+
##
17+
# To set environment variables for all jobs, add in .meta.toml:
18+
# [github]
19+
# env = """
20+
# debug: 1
21+
# image-name: 'org/image'
22+
# image-tag: 'latest'
23+
# """
24+
##
25+
26+
jobs:
27+
qa:
28+
uses: plone/meta/.github/workflows/qa.yml@main
29+
test:
30+
uses: plone/meta/.github/workflows/test.yml@main
31+
coverage:
32+
uses: plone/meta/.github/workflows/coverage.yml@main
33+
dependencies:
34+
uses: plone/meta/.github/workflows/dependencies.yml@main
35+
release_ready:
36+
uses: plone/meta/.github/workflows/release_ready.yml@main
37+
38+
##
39+
# To modify the list of default jobs being created add in .meta.toml:
40+
# [github]
41+
# jobs = [
42+
# "qa",
43+
# "test",
44+
# "coverage",
45+
# "dependencies",
46+
# "release_ready",
47+
# "circular",
48+
# ]
49+
##
50+
51+
##
52+
# To request that some OS level dependencies get installed
53+
# when running tests/coverage jobs, add in .meta.toml:
54+
# [github]
55+
# os_dependencies = "git libxml2 libxslt"
56+
##
57+
58+
59+
##
60+
# Specify additional jobs in .meta.toml:
61+
# [github]
62+
# extra_lines = """
63+
# another:
64+
# uses: org/repo/.github/workflows/file.yml@main
65+
# """
66+
##

.github/workflows/plone_python.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,29 @@ name: Plone backend tests
22

33
on:
44
push:
5+
branches:
6+
- master
7+
- main
58
pull_request:
9+
branches:
10+
- master
11+
- main
612

713
jobs:
814
plone_python:
915
runs-on: ubuntu-latest
1016
strategy:
1117
fail-fast: false
1218
matrix:
13-
python-version: ["3.7", "3.8", "3.9"]
14-
plone-version: ["5.2", "6.0"]
19+
python-version: ["3.9", "3.10", "3.11"]
20+
plone-version: ["6.0"]
1521

1622
steps:
17-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
1824
- name: Install system libraries
1925
run: sudo apt-get install libxml2-dev libxslt1-dev libjpeg-dev
2026
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v5
2228
with:
2329
python-version: ${{ matrix.python-version }}
2430
- name: Install dependencies
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# .github/workflows/rtd-pr-preview.yml
2+
name: readthedocs/actions
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
# Execute this action only on PRs that touch
8+
# documentation files.
9+
# paths:
10+
# - "docs/**"
11+
12+
permissions:
13+
pull-requests: write
14+
15+
jobs:
16+
documentation-links:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: readthedocs/actions/preview@v1
20+
with:
21+
project-slug: "ploneapi"
22+
single-version: "true"

.gitignore

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,55 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/config/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
# python related
5+
*.egg-info
6+
*.pyc
7+
*.pyo
8+
9+
# translation related
110
*.mo
2-
*.py[cod]
3-
*~
4-
/.Python
5-
/.coverage*
6-
/.installed.cfg
7-
/bin/
8-
/build/
9-
/coverage*
10-
/develop-eggs/
11-
/dist/
12-
/docs/Makefile
13-
/docs/html/
14-
/eggs/
15-
/htmlcov
16-
/include/
17-
/lib/
18-
/local.cfg
19-
/local/
20-
/parts/
21-
/share/
22-
/src/plone.api.egg-info/
23-
/var/
24-
/reports/
25-
/pip-selfcheck.json
26-
/_build/
27-
/.tox/
11+
12+
# tools related
13+
build/
14+
.coverage
15+
.*project
16+
coverage.xml
17+
dist/
18+
docs/_build
19+
__pycache__/
20+
.tox
21+
node_modules/
22+
23+
# venv / buildout related
24+
bin/
25+
develop-eggs/
26+
eggs/
27+
.eggs/
28+
etc/
29+
.installed.cfg
30+
include/
31+
lib/
32+
lib64
33+
.mr.developer.cfg
34+
parts/
2835
pyvenv.cfg
36+
var/
37+
local.cfg
38+
39+
# mxdev
40+
/instance/
41+
/.make-sentinels/
42+
/*-mxdev.txt
43+
/reports/
44+
/sources/
45+
/venv/
46+
.installed.txt
47+
48+
49+
##
50+
# Add extra configuration options in .meta.toml:
51+
# [gitignore]
52+
# extra_lines = """
53+
# _your own configuration lines_
54+
# """
55+
##

0 commit comments

Comments
 (0)