Skip to content

Commit 521702c

Browse files
JeffersonBledsoeJeffersonBledsoe
committed
Merge branch 'pretagov-main' into field-validation
# Conflicts: # setup.py # src/collective/volto/formsupport/configure.zcml # src/collective/volto/formsupport/restapi/deserializer/configure.zcml # src/collective/volto/formsupport/restapi/serializer/blocks.py # src/collective/volto/formsupport/restapi/services/submit_form/post.py # src/collective/volto/formsupport/tests/test_send_action_form.py # src/collective/volto/formsupport/tests/test_store_action_form.py
2 parents 9a835b4 + 1f1fc15 commit 521702c

File tree

88 files changed

+3248
-1290
lines changed

Some content is hidden

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

88 files changed

+3248
-1290
lines changed

‎.coveragerc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ omit =
2020
*/lib/*
2121
*.txt
2222
*.rst
23+
*/upgrades.py

‎.editorconfig‎

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,56 @@
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:
6+
# http://EditorConfig.org
7+
# EditorConfig is a convention description, that could be interpreted
8+
# by multiple editors to enforce common coding conventions for specific
9+
# file types
10+
11+
# top-most EditorConfig file:
12+
# Will ignore other EditorConfig files in Home directory or upper tree level.
13+
root = true
14+
15+
116
[*]
2-
indent_style = space
17+
# Default settings for all files.
18+
# Unix-style newlines with a newline ending every file
319
end_of_line = lf
420
insert_final_newline = true
521
trim_trailing_whitespace = true
22+
# Set default charset
623
charset = utf-8
24+
# Indent style default
25+
indent_style = space
26+
# Max Line Length - a hard line wrap, should be disabled
27+
max_line_length = off
728

8-
[{*.py,*.cfg}]
29+
[*.{py,cfg,ini}]
30+
# 4 space indentation
931
indent_size = 4
1032

11-
[{*.html,*.dtml,*.pt,*.zpt,*.xml,*.zcml,*.js}]
33+
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
34+
# 2 space indentation
1235
indent_size = 2
1336

14-
[Makefile]
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+
43+
[{Makefile,.gitmodules}]
44+
# Tab indentation (no size specified, but view as 4 spaces)
1545
indent_style = tab
46+
indent_size = unset
47+
tab_width = unset
48+
49+
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/legacy.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Legacy tests
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
python: ["3.8"]
11+
plone: ["52"]
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Cache eggs
15+
uses: actions/cache@v4
16+
with:
17+
path: eggs
18+
key: ${{ runner.OS }}-build-python${{ matrix.python }}-${{ matrix.plone }}
19+
- name: Set up Python ${{ matrix.python }}
20+
uses: actions/setup-python@v5
21+
with:
22+
python-version: ${{ matrix.python }}
23+
- name: Install dependencies
24+
run: |
25+
pip install -r requirements.txt -c constraints_plone${{ matrix.plone }}.txt
26+
cp test_plone${{ matrix.plone }}.cfg buildout.cfg
27+
- name: Install buildout
28+
run: |
29+
buildout -N -t 3 code-analysis:return-status-codes=True
30+
- name: Run tests
31+
run: |
32+
bin/test

‎.github/workflows/meta.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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+
# circular:
38+
# uses: plone/meta/.github/workflows/circular.yml@main
39+
40+
##
41+
# To modify the list of default jobs being created add in .meta.toml:
42+
# [github]
43+
# jobs = [
44+
# "qa",
45+
# "test",
46+
# "coverage",
47+
# "dependencies",
48+
# "release_ready",
49+
# "circular",
50+
# ]
51+
##
52+
53+
##
54+
# To request that some OS level dependencies get installed
55+
# when running tests/coverage jobs, add in .meta.toml:
56+
# [github]
57+
# os_dependencies = "git libxml2 libxslt"
58+
##
59+
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+
67+
68+
##
69+
# Specify additional jobs in .meta.toml:
70+
# [github]
71+
# extra_lines = """
72+
# another:
73+
# uses: org/repo/.github/workflows/file.yml@main
74+
# """
75+
##

‎.github/workflows/tests.yml‎

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

‎.gitignore‎

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,58 @@
1-
.DS_Store
2-
.python-version
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
35
*.egg-info
4-
*.log
6+
*.pyc
7+
*.pyo
8+
9+
# translation related
510
*.mo
6-
*.py?
7-
*.swp
8-
# dirs
11+
12+
# tools related
13+
build/
14+
.coverage
15+
.*project
16+
coverage.xml
17+
dist/
18+
docs/_build
19+
__pycache__/
20+
.tox
21+
.vscode/
22+
node_modules/
23+
forest.*
24+
25+
# venv / buildout related
926
bin/
10-
buildout-cache/
1127
develop-eggs/
1228
eggs/
13-
extras/
14-
htmlcov/
29+
.eggs/
30+
etc/
31+
.installed.cfg
1532
include/
1633
lib/
17-
local/
18-
node_modules/
19-
parts/
20-
dist/*
21-
test.plone_addon/
22-
var/
23-
# files
24-
.installed.cfg
25-
.mr.developer.cfg
2634
lib64
27-
log.html
28-
output.xml
29-
pip-selfcheck.json
30-
.coverage
31-
report.html
32-
.vscode/
33-
.tox/
34-
reports/
35+
.mr.developer.cfg
36+
parts/
3537
pyvenv.cfg
36-
# excludes
37-
*~
38+
var/
39+
local.cfg
40+
.python-version
41+
42+
# mxdev
43+
/instance/
44+
/.make-sentinels/
45+
/*-mxdev.txt
46+
/reports/
47+
/sources/
48+
/venv/
49+
.installed.txt
50+
51+
52+
##
53+
# Add extra configuration options in .meta.toml:
54+
# [gitignore]
55+
# extra_lines = """
56+
# _your own configuration lines_
57+
# """
58+
##

‎.isort.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[settings]
2+
profile=plone

‎.meta.toml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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+
[meta]
5+
template = "default"
6+
commit-id = "721299ce"

0 commit comments

Comments
 (0)