Skip to content

Commit d7573fc

Browse files
authored
Update package setup, minor tweaks and Google Translate (#3)
* feat: google translate translator * remove unneeded packages * feat: add Google Translate utility * fix: several fixes in translation utilities * feat: native namespaces and hatchling build system * format * required versions * rework dependencies * improve readme * ordering * codespell * ignore mxdev cache * python versions * config with default template * codespell * deps * remove version * Configuring with plone.meta * Configuring with plone.meta * dependencies * feat: handle Deepl options in registry * handle errors * feat: handle LibreTranslate options in registry * whitespace * remove unneeded * Configuring with plone.meta * update translation strings * Configuring with plone.meta * Configuring with plone.meta * python versions
1 parent c49d899 commit d7573fc

Some content is hidden

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

50 files changed

+1079
-276
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: 4 additions & 10 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,14 +25,15 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
28+
uses: plone/meta/.github/workflows/[email protected]
29+
release_ready:
30+
uses: plone/meta/.github/workflows/[email protected]
2931

3032
##
3133
# To modify the list of default jobs being created add in .meta.toml:
3234
# [github]
3335
# jobs = [
3436
# "qa",
35-
# "test",
3637
# "coverage",
3738
# "dependencies",
3839
# "release_ready",
@@ -47,13 +48,6 @@ jobs:
4748
# os_dependencies = "git libxml2 libxslt"
4849
##
4950

50-
##
51-
# To test against a specific matrix of python versions
52-
# when running tests jobs, add in .meta.toml:
53-
# [github]
54-
# py_versions = "['3.12', '3.11']"
55-
##
56-
5751

5852
##
5953
# Specify additional jobs in .meta.toml:

.github/workflows/test-matrix.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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+
25+
runs-on: ${{ matrix.os[1] }}
26+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
27+
name: ${{ matrix.config[1] }}
28+
steps:
29+
- uses: actions/checkout@v6
30+
with:
31+
persist-credentials: false
32+
- name: Set up Python
33+
uses: actions/setup-python@v6
34+
with:
35+
python-version: ${{ matrix.config[0] }}
36+
allow-prereleases: true
37+
38+
##
39+
# Add extra configuration options in .meta.toml:
40+
# [github]
41+
# extra_lines_after_os_dependencies = """
42+
# _your own configuration lines_
43+
# """
44+
##
45+
- name: Pip cache
46+
uses: actions/cache@v4
47+
with:
48+
path: ~/.cache/pip
49+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
50+
restore-keys: |
51+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
52+
${{ runner.os }}-pip-
53+
- name: Install dependencies
54+
run: |
55+
python -m pip install --upgrade pip
56+
pip install tox
57+
- name: Initialize tox
58+
# the bash one-liner below does not work on Windows
59+
if: contains(matrix.os, 'ubuntu')
60+
run: |
61+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
62+
- name: Test
63+
run: tox -e ${{ matrix.config[2] }}
64+
65+
66+
##
67+
# Add extra configuration options in .meta.toml:
68+
# [github]
69+
# extra_lines = """
70+
# _your own configuration lines_
71+
# """
72+
##

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
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
66
*.pyc
77
*.pyo
8+
9+
# translation related
810
*.mo
911

1012
# tools related
1113
build/
1214
.coverage
15+
.*project
1316
coverage.xml
1417
dist/
1518
docs/_build
1619
__pycache__/
1720
.tox
1821
.vscode/
1922
node_modules/
23+
forest.dot
24+
forest.json
2025

2126
# venv / buildout related
2227
bin/
@@ -32,6 +37,7 @@ lib64
3237
parts/
3338
pyvenv.cfg
3439
var/
40+
local.cfg
3541

3642
# mxdev
3743
/instance/
@@ -41,6 +47,7 @@ var/
4147
/sources/
4248
/venv/
4349
.installed.txt
50+
4451
.lock
4552

4653
##

.meta.toml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
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 = "71d0218b"
6+
commit-id = "2.3.0"
77

88
[pyproject]
99
codespell_skip = "*.min.js"
1010
codespell_ignores = "vew"
11-
dependencies_mappings = [
12-
"pytest-plone = ['pytest', 'plone.testing', 'plone.app.testing']",
13-
]
14-
dependencies_ignores = "['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest-cov']"
11+
dependencies_mappings = []
12+
dependencies_ignores = "['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest-cov', 'boto3', 'deepl', 'ollama', 'openai']"
1513

1614
[gitignore]
1715
extra_lines = """
1816
.lock
1917
"""
2018

2119
[tox]
22-
test_runner = "pytest"
23-
test_path = "/tests"
24-
use_mxdev = true
25-
test_deps_additional = ""
20+
# test_runner = "pytest"
21+
# test_path = "/tests"
22+
# use_mxdev = true
23+
# test_deps_additional = ""
24+
test_matrix = { "6.2" = ["*"] }
2625

2726
[github]
2827
py_versions = "[\"3.12\", \"3.11\", \"3.10\"]"
29-
jobs = [
30-
"qa",
31-
"release_ready",
32-
]
28+
jobs = ["qa", "release_ready"]

.pre-commit-config.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
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
66
autoupdate_schedule: monthly
77

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.14.0
10+
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 5.12.0
15+
rev: 7.0.0
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 23.9.1
18+
- repo: https://github.com/psf/black-pre-commit-mirror
19+
rev: 25.11.0
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty
23-
rev: 3.1.0
23+
rev: 3.1.1
2424
hooks:
2525
- id: zpretty
2626

@@ -32,7 +32,7 @@ repos:
3232
# """
3333
##
3434
- repo: https://github.com/PyCQA/flake8
35-
rev: 6.1.0
35+
rev: 7.3.0
3636
hooks:
3737
- id: flake8
3838

@@ -44,7 +44,7 @@ repos:
4444
# """
4545
##
4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.2.6
47+
rev: v2.4.1
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
@@ -58,20 +58,20 @@ repos:
5858
# """
5959
##
6060
- repo: https://github.com/mgedmin/check-manifest
61-
rev: "0.49"
61+
rev: "0.51"
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
65-
rev: "4.2"
65+
rev: "5.0"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions
69-
rev: "0.21.3"
69+
rev: "0.24.0"
7070
hooks:
7171
- id: check-python-versions
7272
args: ['--only', 'setup.py,pyproject.toml']
7373
- repo: https://github.com/collective/i18ndude
74-
rev: "6.1.0"
74+
rev: "6.3.0"
7575
hooks:
7676
- id: i18ndude
7777

0 commit comments

Comments
 (0)