From 2680afc2326f30192dc8405fa16a4ad894e201c5 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:50:24 +0000 Subject: [PATCH 1/2] Updated files with 'repo_helper'. --- .pre-commit-config.yaml | 2 +- doc-source/conf.py | 6 ++++++ formate.toml | 16 ++++++++-------- pyproject.toml | 27 ++++++++++++--------------- tox.ini | 2 +- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f9be0be..61562c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.1 + rev: v0.11.0 hooks: - id: reformat-pyproject diff --git a/doc-source/conf.py b/doc-source/conf.py index d2e09e8..200fad5 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -69,8 +69,14 @@ def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout + from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) + app.connect("build-finished", sphinxemoji.copy_asset_files) + app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("twemoji.js") + app.add_css_file("twemoji.css") + app.add_transform(sphinxemoji.EmojiSubstitutions) # 3rd party diff --git a/formate.toml b/formate.toml index 3618688..381dfa0 100644 --- a/formate.toml +++ b/formate.toml @@ -6,21 +6,17 @@ noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 -[config] -indent = "\t" -line_length = 115 - [hooks.yapf] priority = 30 -[hooks.isort] -priority = 50 - [hooks.yapf.kwargs] yapf_style = ".style.yapf" +[hooks.isort] +priority = 50 + [hooks.isort.kwargs] -indent = "\t\t" +indent = " " multi_line_output = 8 import_heading_stdlib = "stdlib" import_heading_thirdparty = "3rd party" @@ -61,3 +57,7 @@ known_third_party = [ "ytools3", ] known_first_party = [ "configconfig",] + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index 1f9e753..456a74b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ dynamic = [ "requires-python", "classifiers", "dependencies",] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" - [project.license] file = "LICENSE" @@ -66,7 +65,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -77,7 +75,6 @@ extensions = [ "sphinx_toolbox_experimental.missing_xref", "sphinx_toolbox.more_autosummary.column_widths", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -129,6 +126,9 @@ autodoc_exclude_members = [ [tool.dep_checker] namespace_packages = "ruamel.yaml" +[tool.dep_checker.name_mapping] +ruamel-yaml = "ruamel.yaml" + [tool.mypy] python_version = "3.8" namespace_packages = true @@ -141,8 +141,15 @@ incremental = false [tool.snippet-fmt] directives = [ "code-block",] -[tool.dep_checker.name_mapping] -ruamel-yaml = "ruamel.yaml" +[tool.snippet-fmt.languages.python] +reformat = true + +[tool.snippet-fmt.languages.TOML] +reformat = true + +[tool.snippet-fmt.languages.ini] + +[tool.snippet-fmt.languages.json] [tool.dependency-dash."requirements.txt"] order = 10 @@ -154,13 +161,3 @@ include = false [tool.dependency-dash."doc-source/requirements.txt"] order = 30 include = false - -[tool.snippet-fmt.languages.python] -reformat = true - -[tool.snippet-fmt.languages.TOML] -reformat = true - -[tool.snippet-fmt.languages.ini] - -[tool.snippet-fmt.languages.json] diff --git a/tox.ini b/tox.ini index 8a60500..5246522 100644 --- a/tox.ini +++ b/tox.ini @@ -102,7 +102,7 @@ deps = flake8-github-actions>=0.1.0 flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 - flake8-pytest-style>=1.3.0 + flake8-pytest-style>=1.3.0,<2 flake8-quotes>=3.3.0 flake8-slots>=0.1.0 flake8-sphinx-links>=0.0.4 From d280b909643e3fd7f4a1f55dd29771cdfd13ab15 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:51:06 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 456a74b..f8851f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,13 +10,13 @@ readme = "README.rst" keywords = [ "configuration", "yaml",] dynamic = [ "requires-python", "classifiers", "dependencies",] +[project.license] +file = "LICENSE" + [[project.authors]] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" -[project.license] -file = "LICENSE" - [project.urls] Homepage = "https://github.com/repo-helper/configconfig" "Issue Tracker" = "https://github.com/repo-helper/configconfig/issues"