From 9fe630b5469a4f86afae7cda2fe1dc1c066129c8 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:22:30 +0000 Subject: [PATCH] [repo-helper] Configuration Update (#44) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- doc-source/conf.py | 6 ++++++ formate.toml | 16 ++++++++-------- pyproject.toml | 23 ++++++++++------------- tox.ini | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 274d501..0764db7 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 f473e99..1bc1895 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -73,5 +73,11 @@ 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) diff --git a/formate.toml b/formate.toml index e3e5bcf..a88435b 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" @@ -45,3 +41,7 @@ known_third_party = [ ] known_first_party = [ "repo_helper_sphinx_theme",] line_length = 115 + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index bd7b2ef..9037512 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" @@ -24,6 +23,9 @@ Homepage = "https://github.com/repo-helper/repo_helper_sphinx_theme" "Source Code" = "https://github.com/repo-helper/repo_helper_sphinx_theme" Documentation = "https://repo-helper-sphinx-theme.readthedocs.io/en/latest" +[project.entry-points."sphinx.html_themes"] +repo_helper_sphinx_theme = "repo_helper_sphinx_theme" + [tool.importcheck] [tool.whey] @@ -67,7 +69,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -76,7 +77,6 @@ extensions = [ "seed_intersphinx_mapping", "html_section", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -136,16 +136,6 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] -[project.entry-points."sphinx.html_themes"] -repo_helper_sphinx_theme = "repo_helper_sphinx_theme" - -[tool.dependency-dash."requirements.txt"] -order = 10 - -[tool.dependency-dash."doc-source/requirements.txt"] -order = 30 -include = false - [tool.snippet-fmt.languages.python] reformat = true @@ -155,3 +145,10 @@ reformat = true [tool.snippet-fmt.languages.ini] [tool.snippet-fmt.languages.json] + +[tool.dependency-dash."requirements.txt"] +order = 10 + +[tool.dependency-dash."doc-source/requirements.txt"] +order = 30 +include = false diff --git a/tox.ini b/tox.ini index f31595d..2b6d09b 100644 --- a/tox.ini +++ b/tox.ini @@ -86,7 +86,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