From 43f55c1ef37e867f87c0ed19fe4a6ca58cbe8643 Mon Sep 17 00:00:00 2001 From: Peter Mathis Date: Sun, 30 Jul 2023 22:31:25 +0200 Subject: [PATCH] latest plone/meta update --- .editorconfig | 1 + .github/workflows/meta.yml | 42 +++++++++++++++++++++++++++++++++++++- .gitignore | 3 +++ .meta.toml | 2 +- .pre-commit-config.yaml | 10 +++++++++ pyproject.toml | 1 - tox.ini | 19 +++++++++++++++++ 7 files changed, 75 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 919b41166..8ae05aaaa 100644 --- a/.editorconfig +++ b/.editorconfig @@ -36,6 +36,7 @@ indent_size = 2 [*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development # 2 space indentation indent_size = 2 +max_line_length = 80 [{Makefile,.gitmodules}] # Tab indentation (no size specified, but view as 4 spaces) diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index a7f25e02e..39a164d7e 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -13,6 +13,16 @@ on: - main workflow_dispatch: +## +# To set environment variables for all jobs, add in .meta.toml: +# [github] +# env = """ +# debug: 1 +# image-name: 'org/image' +# image-tag: 'latest' +# """ +## + jobs: qa: uses: plone/meta/.github/workflows/qa.yml@main @@ -22,7 +32,37 @@ jobs: uses: plone/meta/.github/workflows/coverage.yml@main dependencies: uses: plone/meta/.github/workflows/dependencies.yml@main - release-ready: + release_ready: uses: plone/meta/.github/workflows/release_ready.yml@main circular: uses: plone/meta/.github/workflows/circular.yml@main + +## +# To modify the list of default jobs being created add in .meta.toml: +# [github] +# jobs = [ +# "qa", +# "test", +# "coverage", +# "dependencies", +# "release_ready", +# "circular", +# ] +## + +## +# To request that some OS level dependencies get installed +# when running tests/coverage jobs, add in .meta.toml: +# [github] +# os_dependencies = "git libxml2 libxslt" +## + + +## +# Specify additional jobs in .meta.toml: +# [github] +# extra_lines = """ +# another: +# uses: org/repo/.github/workflows/file.yml@main +# """ +## diff --git a/.gitignore b/.gitignore index 81594fde9..6913c47e2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ *.pyc *.pyo +# translation related +*.mo + # tools related build/ .coverage diff --git a/.meta.toml b/.meta.toml index 1e5a12014..b18246b46 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,7 +3,7 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "cfffba8c" +commit-id = "a7c2b777" [pyproject] codespell_skip = "*.min.js,*.min.js.map,*.svg,yarn.lock,*.json,*/icons_country_flags.xml" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df6024cb0..3cb7cf431 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -75,6 +75,16 @@ repos: hooks: - id: i18ndude + +## +# Add extra configuration options in .meta.toml: +# [pre_commit] +# i18ndude_extra_lines = """ +# _your own configuration lines_ +# """ +## + + ## # Add extra configuration options in .meta.toml: # [pre_commit] diff --git a/pyproject.toml b/pyproject.toml index c338c284a..7a5a2a67e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,6 @@ python-dateutil = ['dateutil'] # "gitpython = ['git']", # "pygithub = ['github']", # ] -# """ ## [tool.check-manifest] diff --git a/tox.ini b/tox.ini index 2f7b44952..94a892c7d 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,13 @@ commands = echo "Unrecognized environment name {envname}" false +[testenv:init] +description = Prepare environment +skip_install = true +commands = + echo "Initial setup complete" + + [testenv:format] description = automatically reformat code skip_install = true @@ -86,11 +93,20 @@ set_env = # test_environment_variables = """ # PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/ # """ +# +# Set constrain_package_deps .meta.toml: +# [tox] +# constrain_package_deps = "false" ## deps = zope.testrunner -c https://dist.plone.org/release/6.0-dev/constraints.txt + ## +# Specify additional deps in .meta.toml: +# [tox] +# test_deps_additional = "-esources/plonegovbr.portal_base[test]" +# # Specify a custom constraints file in .meta.toml: # [tox] # constraints_file = "https://my-server.com/constraints.txt" @@ -128,6 +144,7 @@ deps = coverage zope.testrunner -c https://dist.plone.org/release/6.0-dev/constraints.txt + commands = coverage run --branch --source plone.staticresources {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir}/src -s plone.staticresources {posargs} coverage report -m --format markdown @@ -144,6 +161,7 @@ deps = build towncrier -c https://dist.plone.org/release/6.0-dev/constraints.txt + commands = # fake version to not have to install the package # we build the change log as news entries might break @@ -171,6 +189,7 @@ deps = pipdeptree pipforester -c https://dist.plone.org/release/6.0-dev/constraints.txt + commands = # Generate the full dependency tree sh -c 'pipdeptree -j > forest.json'