From 2b08b652fed4d696f6d63e0731fd541b8b89db93 Mon Sep 17 00:00:00 2001 From: MrTango Date: Fri, 3 Nov 2023 14:28:42 +0200 Subject: [PATCH] add py setup in tox.ini --- .github/workflows/python-package.yml | 1 + bobtemplates/plone/addon/setup.cfg.bob | 1 + tox.ini | 29 +++++++++++++++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f7872298..e522339e 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -42,6 +42,7 @@ jobs: - name: Black-Check run: | tox -r -e black-check + if: matrix.python-version == '3.11' - name: Test with tox run: | tox -r diff --git a/bobtemplates/plone/addon/setup.cfg.bob b/bobtemplates/plone/addon/setup.cfg.bob index 7f3f5c2b..7e606863 100644 --- a/bobtemplates/plone/addon/setup.cfg.bob +++ b/bobtemplates/plone/addon/setup.cfg.bob @@ -13,6 +13,7 @@ profile = plone # black compatible flake8 rules: ignore = W503, + W391, C812, E501 T001 diff --git a/tox.ini b/tox.ini index 1803547c..840a4fab 100644 --- a/tox.ini +++ b/tox.ini @@ -6,15 +6,15 @@ envlist = py38-lint py39-lint py310-lint + py311-lint black-check docs - py{310,39,38}-packagetests + py{311,310,39,38}-packagetests py{38}-skeletontests-Plone{52}-template-addon - py{310,39}-skeletontests-Plone{60}-template-addon + py{311,310,39}-skeletontests-Plone{60}-template-addon py{38}-skeletontests-Plone{52}-template-addon_all - py{310,39}-skeletontests-Plone{60}-template-addon_all - py{310,39}-skeletontests-Plone{60}-template-addon_theme_barceoneta - py{38,39,310}-skeletontests-Plone{60}-template-addon_mockup_pattern + py{311,310,39}-skeletontests-Plone{60}-template-addon_all + py{38,39,310,311}-skeletontests-Plone{60}-template-addon_mockup_pattern coverage-report skip_missing_interpreters = True @@ -24,6 +24,7 @@ python = 3.8: py38 3.9: py39 3.10: py310 + 3.11: py311 [testenv] usedevelop = True @@ -34,6 +35,7 @@ basepython: py38: python3.8 py39: python3.9 py310: python3.10 + py311: python3.11 commands = mkdir -p {toxinidir}/_build/reports/coverage {toxinidir}/_build/reports/pytest @@ -96,7 +98,7 @@ skip_install = true commands = coverage erase [testenv:isort-apply] -basepython = python3.10 +basepython = python3.11 deps = -cconstraints.txt isort @@ -170,8 +172,15 @@ deps = {[lint]deps} commands = {[lint]commands} allowlist_externals = {[lint]allowlist_externals} +[testenv:py311-lint] +basepython = python3.11 +skip_install = true +deps = {[lint]deps} +commands = {[lint]commands} +allowlist_externals = {[lint]allowlist_externals} + [testenv:black-check] -basepython = python3.10 +basepython = python3.11 skip_install = True deps = -cconstraints.txt @@ -181,7 +190,7 @@ commands = black --check --diff -v bobtemplates setup.py skeleton-tests package_tests [testenv:black-enforce] -basepython = python3.10 +basepython = python3.11 skip_install = True deps = -cconstraints.txt @@ -191,7 +200,7 @@ commands = black -v bobtemplates setup.py skeleton-tests package_tests [testenv:docs] -basepython = python3.10 +basepython = python3.11 commands = sphinx-build -b html -d _build/docs/doctrees docs _build/docs/html -W # sphinx-build -b doctest docs _build/docs/doctrees @@ -202,7 +211,7 @@ deps = [testenv:release] skip_install = true -basepython = python3.10 +basepython = python3.11 deps = -cconstraints.txt