From 10b0688797d68b8c70d4fcba2c7825e7c5005886 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 4 Jan 2023 12:02:50 +0800 Subject: [PATCH 1/2] Update constraints. --- constraints/default.txt | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/constraints/default.txt b/constraints/default.txt index 27bad2f3..249f968c 100644 --- a/constraints/default.txt +++ b/constraints/default.txt @@ -1,67 +1,66 @@ alabaster==0.7.12 -attrs==22.1.0 +attrs==22.2.0 autodoc-pydantic==1.8.0 Babel==2.11.0 beautifulsoup4==4.11.1 -black==22.10.0 +black==22.12.0 bleach==5.0.1 build==0.9.0 -certifi==2022.9.24 +certifi==2022.12.7 charset-normalizer==2.1.1 click==8.1.3 colorama==0.4.6 commonmark==0.9.1 -coverage==6.5.0 +coverage==7.0.3 docutils==0.19 -exceptiongroup==1.0.4 -furo==2022.9.29 +exceptiongroup==1.1.0 +furo==2022.12.7 idna==3.4 imagesize==1.4.1 -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 iniconfig==1.1.1 -isort==5.10.1 +isort==5.11.4 jaraco.classes==3.2.3 Jinja2==3.1.2 -keyring==23.11.0 +keyring==23.13.1 livereload==2.6.3 MarkupSafe==2.1.1 more-itertools==9.0.0 mypy==0.991 mypy-extensions==0.4.3 -packaging==21.3 -pathspec==0.10.2 +packaging==22.0 +pathspec==0.10.3 pep517==0.13.0 -pkginfo==1.9.2 -platformdirs==2.5.4 +pkginfo==1.9.3 +platformdirs==2.6.2 pluggy==1.0.0 -pydantic==1.10.2 -Pygments==2.13.0 -pyparsing==3.0.9 +pydantic==1.10.4 +Pygments==2.14.0 pytest==7.2.0 pytest-cov==4.0.0 -pytz==2022.6 +pytz==2022.7 readme-renderer==37.3 requests==2.28.1 requests-toolbelt==0.10.1 rfc3986==2.0.0 rich==12.6.0 -ruff==0.0.151 -setuptools-scm==7.0.5 -shellingham==1.5.0 +ruff==0.0.209 +setuptools-scm==7.1.0 +shellingham==1.5.0.post1 six==1.16.0 snowballstemmer==2.2.0 soupsieve==2.3.2.post1 -Sphinx==5.3.0 +Sphinx==6.0.0 sphinx-autobuild==2021.3.14 sphinx-basic-ng==1.0.0b1 -sphinx-click==4.3.0 +sphinx-click==4.4.0 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -toml-sort==0.20.1 +toml-sort==0.22.1 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 From 566c03dd9c0207f0ce64ca1f4b7e2d1af8bad283 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Wed, 4 Jan 2023 12:03:48 +0800 Subject: [PATCH 2/2] Update pyproject.toml and the corresponding template. --- pyproject.toml | 63 ++++++++++++++++---------------------------- pyproject.toml.jinja | 63 ++++++++++++++++---------------------------- 2 files changed, 44 insertions(+), 82 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 706dbaf5..350def3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,34 +1,34 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "setuptools", - "setuptools-scm", + "setuptools", + "setuptools-scm" ] [project] authors = [ - {name = "huxuan", email = "i@huxuan.org"}, + {email = "i@huxuan.org", name = "huxuan"} ] classifiers = [ - "Development Status :: 4 - Beta", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", + "Development Status :: 4 - Beta", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9" ] description = "A serious Python project template for out-of-box and production usage." dynamic = [ - "version", - "dependencies", - "optional-dependencies", + "dependencies", + "optional-dependencies", + "version" ] keywords = [ - "out-of-box", - "production", - "project template", - "template", + "out-of-box", + "production", + "project template", + "template" ] name = "serious-scaffold" readme = "README.md" @@ -46,7 +46,7 @@ fail_under = 100 [tool.coverage.run] omit = [ - "src/{{ module_name }}/*", + "src/{{ module_name }}/*" ] [tool.mypy] @@ -54,10 +54,10 @@ check_untyped_defs = true disallow_any_unimported = true disallow_untyped_defs = true enable_error_code = [ - "ignore-without-code", + "ignore-without-code" ] exclude = [ - "src/{{ module_name }}", + "src/{{ module_name }}" ] no_implicit_optional = true show_error_codes = true @@ -84,30 +84,11 @@ extend-ignore = [ "D407", "D408", "D409", - "D413", -] -extend-select = [ - "I", - "D", - "U", - "N", - "S", - "C", - "FBT", - "B", - "A", - "I25", - "T", - "Q", - "ANN", - "YTT", - "BLE", - "C90", - "RUF", - "M", + "D413" ] fix = true per-file-ignores = {"tests/*" = ["S101"]} +select = ["ALL"] src = ["src"] target-version = "py38" diff --git a/pyproject.toml.jinja b/pyproject.toml.jinja index 3a869cf0..eb183866 100644 --- a/pyproject.toml.jinja +++ b/pyproject.toml.jinja @@ -1,34 +1,34 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "setuptools", - "setuptools-scm", + "setuptools", + "setuptools-scm" ] [project] authors = [ - {name = "{{ author_name }}", email = "{{ author_email }}"}, + {email = "{{ author_email }}", name = "{{ author_name }}"} ] classifiers = [ - "Development Status :: 4 - Beta", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", + "Development Status :: 4 - Beta", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9" ] description = "{{ project_description }}" dynamic = [ - "version", - "dependencies", - "optional-dependencies", + "dependencies", + "optional-dependencies", + "version" ] keywords = [ - "out-of-box", - "production", - "project template", - "template", + "out-of-box", + "production", + "project template", + "template" ] name = "{{ package_name }}" readme = "README.md" @@ -47,7 +47,7 @@ fail_under = 100 [tool.coverage.run] omit = [ {%- if project_name == "Serious Scaffold Python" %} - "src/{{ '{{ module_name }}' }}/*", + "src/{{ '{{ module_name }}' }}/*" {%- endif %} ] @@ -56,11 +56,11 @@ check_untyped_defs = true disallow_any_unimported = true disallow_untyped_defs = true enable_error_code = [ - "ignore-without-code", + "ignore-without-code" ] exclude = [ {%- if project_name == "Serious Scaffold Python" %} - "src/{{ '{{ module_name }}' }}", + "src/{{ '{{ module_name }}' }}" {%- endif %} ] no_implicit_optional = true @@ -88,30 +88,11 @@ extend-ignore = [ "D407", "D408", "D409", - "D413", -] -extend-select = [ - "I", - "D", - "U", - "N", - "S", - "C", - "FBT", - "B", - "A", - "I25", - "T", - "Q", - "ANN", - "YTT", - "BLE", - "C90", - "RUF", - "M", + "D413" ] fix = true per-file-ignores = {"tests/*" = ["S101"]} +select = ["ALL"] src = ["src"] target-version = "py38"