From aaa0854b5363683e74164a9193bb08bf6cbb9bb8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 9 Aug 2021 19:49:51 +0100 Subject: [PATCH 1/2] Rebrand for formate --- README.rst | 4 ++-- contributing/__init__.py | 2 +- doc-source/_templates/base.html | 1 + doc-source/conf.py | 3 ++- doc-source/formate.png | Bin 0 -> 1667 bytes doc-source/getting-started.rst | 2 +- pyproject.toml | 12 ++++++------ repo_helper.yml | 11 +++++++---- 8 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 doc-source/formate.png diff --git a/README.rst b/README.rst index 065ba60..9d1d43f 100644 --- a/README.rst +++ b/README.rst @@ -4,8 +4,8 @@ Contributing Guide .. start short_desc -**Contributing guide for repo-helper and associated projects** +**Contributing guide for projects in the python-formate organization** .. end short_desc -View online at https://contributing.repo-helper.uk +View online at https://contributing-to-formate.readthedocs.io/ diff --git a/contributing/__init__.py b/contributing/__init__.py index 50b7374..73c78c4 100644 --- a/contributing/__init__.py +++ b/contributing/__init__.py @@ -2,7 +2,7 @@ # # __init__.py """ -Contributing guide for repo-helper and associated projects. +Contributing guide for projects in the python-formate organization. """ # # Copyright © 2020-2021 Dominic Davis-Foster diff --git a/doc-source/_templates/base.html b/doc-source/_templates/base.html index b101b24..ffdc5ad 100644 --- a/doc-source/_templates/base.html +++ b/doc-source/_templates/base.html @@ -2,4 +2,5 @@ {% extends "!base.html" %} {% block extrahead %} + {% endblock %} diff --git a/doc-source/conf.py b/doc-source/conf.py index 1b1e520..b30076c 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -102,4 +102,5 @@ def setup(app): nitpicky = True del version del release -html_title = "repo-helper Contributing Guide" +html_title = "formate Contributing Guide" +html_logo = "formate.png" diff --git a/doc-source/formate.png b/doc-source/formate.png new file mode 100644 index 0000000000000000000000000000000000000000..02d7f8d327e9147e19344ba68596a85a286c0550 GIT binary patch literal 1667 zcmV-}27LL6P)n4`v3p{8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11`tU^ zK~#90?VWpw6;&9(e|L4;+*Mm;6Wz_Qw6J%iRs zV$VOU{>kV`C1OQVnNdW=TC}~au&nj5ly2Itdi&!$!?}CAGdr_8ch20I?+3%VJNKM> zzB%8_Ip6u_oNqx<6h%=KMNt$*QIvEr4|oCi9ykc>2X+GMf$0wA$~@zNZ9uW)_#61A z_ zAFjS=`QRF)K@S3xL*$=l^8X98RZ*_o@D|dbk47l7-ITevDiY<0;mAN+1TKqEZiOlH zUNwZu6BDr(P87>#rYWv8gFvVG?ig^p6Df1Ra%6H<^f@|!+0LYkk%DUh0%$<2oJ$eY^cXVeZUa82hHZaE z3B?>>L)p1D;AvoL^5W!=yRj|`kMoc*AQSyRq-Q3aTT}s#Q3W_g72p_EfMZkvj!^|T zMit-~Re)nu0gh1xI7SuV7*&8{Q~{1r1vo|(;22eaV}`jFAb=)hW8T{(=Y|8LfUU@K zMnxGKX`8EDgvtm@?DN}RYi24a4gKmMoL+V^?JSr%)q+Mn}J)g!JXbP z=i7h_k`gvcoQVxpwyfm*E!fD2UR<~X^mj>b!4B4sBVi7n09q1|yXF~*?0P?fgsNG= z|NHz_U={Ew;+8&yxT#-3+|#Aw*9f2;c`~}qXN@0GfjVFb(xAP-V}vs~!_o#kkGw1B zL?SCHhD(4?knZCh;H)avH3Rs#q^?|hOi#hymEQtaCsc0%dD`}1pSI?N>K-(6kV()$ zfl!B;e2egpa@dIU#RriAw4LZN;o_hP8E+0F0l+JbH$hAU?f{+xHY1kVT4Wv)d+h2C z)5#448euQ&>-@OC}?3iz2eJVpec=Mj%g3FaA+meqrFYio{SA zFb((+8%*{5IE9OeE0EaKMc_@~vn#RSC};>q1uFtwvVdd2B+i?RWfdq5^OaqJU$>G$S9Z0#+e5c&*vrW04gW zeaPGbU@ms@cTtGn@M72fh#gy&0l)ejTZ4XVunHK7_;G5LDJ7pbBiFSqWZ6b!a4&7Q zF~HeA$LT>o7RMl5%QRsBQ^&LjXzq_%VcK3vx~3Dko0|}eB`g=4^y{bGrSn Date: Tue, 20 Jan 2026 12:44:25 +0000 Subject: [PATCH 2/2] Updated files with 'repo_helper'. --- .pre-commit-config.yaml | 4 ++-- formate.toml | 1 + tox.ini | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index adc4683..a820125 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/domdfcoding/pre-commit-hooks - rev: v0.4.0 + rev: v0.5.0 hooks: - id: requirements-txt-sorter args: @@ -80,7 +80,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.9.0 + rev: v1.1.2 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/formate.toml b/formate.toml index d9387a5..f250168 100644 --- a/formate.toml +++ b/formate.toml @@ -5,6 +5,7 @@ reformat-generics = 40 noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 +newline_after_equals = 90 [hooks.yapf] priority = 30 diff --git a/tox.ini b/tox.ini index 2cc0fbc..7be7ac9 100644 --- a/tox.ini +++ b/tox.ini @@ -104,7 +104,6 @@ deps = git+https://github.com/python-formate/flake8-missing-annotations.git git+https://github.com/domdfcoding/pydocstyle.git@stub-functions pygments>=2.7.1 - importlib_metadata<4.5.0; python_version<'3.8' commands = python3 -m flake8_rst_docstrings_sphinx contributing --allow-toolbox {posargs} [testenv:perflint]