Skip to content

Commit a005610

Browse files
gforcadagforcada
authored
Merge pull request #112 from plone/bump-versions
Update minimal python requirements
2 parents a09cef2 + 3a0e1fb commit a005610

File tree

12 files changed

+220
-75
lines changed

12 files changed

+220
-75
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/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:
@@ -13,7 +13,8 @@
1313
root = true
1414

1515

16-
[*] # For All Files
16+
[*]
17+
# Default settings for all files.
1718
# Unix-style newlines with a newline ending every file
1819
end_of_line = lf
1920
insert_final_newline = true
@@ -29,11 +30,12 @@ max_line_length = off
2930
# 4 space indentation
3031
indent_size = 4
3132

32-
[*.{yml,zpt,pt,dtml,zcml}]
33+
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
3334
# 2 space indentation
3435
indent_size = 2
3536

36-
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development
37+
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
38+
# Frontend development
3739
# 2 space indentation
3840
indent_size = 2
3941
max_line_length = 80

‎.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/master/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

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
# Check for updates to GitHub Actions every week
11+
interval: "weekly"

‎.github/workflows/meta.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/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,22 +25,21 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
28+
uses: plone/meta/.github/workflows/qa.yml@2.x
2929
test:
30-
uses: plone/meta/.github/workflows/test.yml@main
30+
uses: plone/meta/.github/workflows/test.yml@2.x
3131
coverage:
32-
uses: plone/meta/.github/workflows/coverage.yml@main
32+
uses: plone/meta/.github/workflows/coverage.yml@2.x
3333
dependencies:
34-
uses: plone/meta/.github/workflows/dependencies.yml@main
34+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3535
release_ready:
36-
uses: plone/meta/.github/workflows/release_ready.yml@main
36+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
3737

3838
##
3939
# To modify the list of default jobs being created add in .meta.toml:
4040
# [github]
4141
# jobs = [
4242
# "qa",
43-
# "test",
4443
# "coverage",
4544
# "dependencies",
4645
# "release_ready",

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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+
42+
##
43+
# Add extra configuration options in .meta.toml:
44+
# [github]
45+
# extra_lines_after_os_dependencies = """
46+
# _your own configuration lines_
47+
# """
48+
##
49+
- name: Pip cache
50+
uses: actions/cache@v4
51+
with:
52+
path: ~/.cache/pip
53+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
54+
restore-keys: |
55+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
56+
${{ runner.os }}-pip-
57+
- name: Install dependencies
58+
run: |
59+
python -m pip install --upgrade pip
60+
pip install tox
61+
- name: Initialize tox
62+
# the bash one-liner below does not work on Windows
63+
if: contains(matrix.os, 'ubuntu')
64+
run: |
65+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
66+
- name: Test
67+
run: tox -e ${{ matrix.config[2] }}
68+
69+
70+
##
71+
# Add extra configuration options in .meta.toml:
72+
# [github]
73+
# extra_lines = """
74+
# _your own configuration lines_
75+
# """
76+
##

‎.gitignore‎

Lines changed: 4 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/master/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/
@@ -35,6 +37,7 @@ lib64
3537
parts/
3638
pyvenv.cfg
3739
var/
40+
local.cfg
3841

3942
# mxdev
4043
/instance/

‎.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/master/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 = "68cda6e4"
6+
commit-id = "2.1.1.dev0"
77

88
[flake8]
99
extra_lines = """

‎.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/master/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

‎news/+ignore.internal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update config files [plone devs]

‎pyproject.toml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/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
4+
[build-system]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
6+
47
[tool.towncrier]
58
directory = "news/"
69
filename = "CHANGES.rst"
@@ -34,7 +37,7 @@ showcontent = true
3437

3538
[[tool.towncrier.type]]
3639
directory = "tests"
37-
name = "Tests"
40+
name = "Tests:"
3841
showcontent = true
3942

4043
##
@@ -68,7 +71,7 @@ target-version = ["py38"]
6871
##
6972

7073
[tool.codespell]
71-
ignore-words-list = "discreet,thet"
74+
ignore-words-list = "discreet,assertin,thet,"
7275
skip = "*.po,"
7376
##
7477
# Add extra configuration options in .meta.toml:
@@ -116,6 +119,7 @@ Zope = [
116119
'Products.CMFCore', 'Products.CMFDynamicViewFTI',
117120
]
118121
python-dateutil = ['dateutil']
122+
pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
119123
ignore-packages = ['decorator', 'robotframework-selenium2library', 'robotsuite', 'selenium']
120124

121125
##
@@ -131,20 +135,27 @@ ignore-packages = ['decorator', 'robotframework-selenium2library', 'robotsuite',
131135
[tool.check-manifest]
132136
ignore = [
133137
".editorconfig",
138+
".flake8",
134139
".meta.toml",
135140
".pre-commit-config.yaml",
136-
"tox.ini",
137-
".flake8",
141+
"dependabot.yml",
138142
"mx.ini",
143+
"tox.ini",
139144

140145
]
146+
141147
##
142148
# Add extra configuration options in .meta.toml:
143149
# [pyproject]
144150
# check_manifest_ignores = """
145151
# "*.map.js",
146152
# "*.pyc",
147153
# """
154+
# check_manifest_extra_lines = """
155+
# ignore-bad-ideas = [
156+
# "some/test/file/PKG-INFO",
157+
# ]
158+
# """
148159
##
149160

150161

0 commit comments

Comments
 (0)