From 36757bd62428ab114539c4f798c42a68c9329cd6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 1 Oct 2024 15:01:51 +0100 Subject: [PATCH] Update config files. --- pyproject.toml | 3 ++- repo_helper.yml | 1 + tox.ini | 22 +++++++++------------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fff2283..653241d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = [ "setuptools!=61.*,>=40.6.0", "wheel>=0.34.2",] +requires = [ "setuptools!=61.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",] build-backend = "setuptools.build_meta" [project] @@ -61,6 +61,7 @@ warn_unused_ignores = true no_implicit_optional = true plugins = [ "sqlmypy", "flasksqlamypy",] show_error_codes = true +incremental = false [tool.snippet-fmt] directives = [ "code-block",] diff --git a/repo_helper.yml b/repo_helper.yml index 37d8b9b..7cb91e5 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -45,3 +45,4 @@ mypy_version: "1.7.1" tox_unmanaged: - testenv + - testenv:py312 diff --git a/tox.ini b/tox.ini index 2239af6..32ab761 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ # * testenv:.package # * testenv:py313-dev # * testenv:py312-dev -# * testenv:py312 # * testenv:docs # * testenv:build # * testenv:lint @@ -35,11 +34,6 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py312] -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - [testenv:build] setenv = PYTHONDEVMODE=1 @@ -143,6 +137,15 @@ ignore = W002 toplevel = repo_helper_bot package = repo_helper_bot +[testenv:py312] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + GITHUBAPP_ID=1234 + GITHUBAPP_SECRET=abc123 + GITHUBAPP_KEY=ABCDEFG + RH_BOT_IMPORTCHECK=1 + [testenv] setenv = PYTHONDEVMODE=1 @@ -171,10 +174,3 @@ exclude_lines = if typing.TYPE_CHECKING: if __name__ == .__main__.: :[\n\s]*\.\.\. - -[gh-actions] -python = - 3.6: py36, build - 3.7: py37, build - 3.8: py38, build - 3.9: py39, build