From f2e35430d5f671aa518c26abe05616e62ed98043 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 9 Aug 2021 19:49:51 +0100 Subject: [PATCH 1/3] 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: Wed, 6 May 2026 21:32:25 +0000 Subject: [PATCH 2/3] Updated files with 'repo_helper'. --- .github/workflows/docs_test_action.yml | 2 +- .github/workflows/flake8.yml | 4 ++-- .github/workflows/mypy.yml | 4 ++-- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 15 ++++++++++++--- tox.ini | 1 + 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index b3bcd50..0365a4d 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Install and Build 🔧 uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1-py39 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 1ecb7b9..8296b42 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -32,7 +32,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.9" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index b889816..4b27c5d 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -37,7 +37,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.9" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 8e80d72..69d3252 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -45,7 +45,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 60dad29..e9a4537 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -46,7 +46,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 55faf55..bae9216 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -45,7 +45,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ee9683d..7d6b493 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,7 @@ exclude: ^$ ci: autoupdate_schedule: quarterly + skip: [taplo-lint] repos: - repo: https://github.com/repo-helper/pyproject-parser @@ -21,7 +22,6 @@ repos: - id: check-case-conflict - id: check-executables-have-shebangs - id: check-json - - id: check-toml - id: check-yaml - id: check-merge-conflict - id: check-symlinks @@ -31,8 +31,14 @@ repos: - id: mixed-line-ending - id: end-of-file-fixer + - repo: https://github.com/domdfcoding/taplo-pre-commit + rev: v0.10.0 + hooks: + - id: taplo-lint + args: [] + - repo: https://github.com/domdfcoding/pre-commit-hooks - rev: v0.6.0 + rev: v0.7.0 hooks: - id: requirements-txt-sorter args: @@ -40,6 +46,9 @@ repos: - id: check-docstring-first exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$ - id: bind-requirements + args: + - --python-min + - '3.8' - repo: https://github.com/python-formate/flake8-dunder-all rev: v0.5.0 @@ -80,7 +89,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v1.2.0 + rev: v1.2.1 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/tox.ini b/tox.ini index 2465dcb..9f1b726 100644 --- a/tox.ini +++ b/tox.ini @@ -37,6 +37,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 SETUPTOOLS_USE_DISTUTILS=stdlib +download = True deps = importcheck>=0.1.0 commands = python --version From 6198bf0f860fc2d3d1068128261e9a2172db1e73 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 19 May 2026 20:09:25 +0000 Subject: [PATCH 3/3] Updated files with 'repo_helper'. --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- .github/workflows/python_ci_macos.yml | 2 +- justfile | 5 +++++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 8296b42..1f5be86 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -22,7 +22,7 @@ jobs: uses: "actions/checkout@v6" - name: Check for changed files - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 4b27c5d..2b5e4f8 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -27,7 +27,7 @@ jobs: uses: "actions/checkout@v6" - name: Check for changed files - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 69d3252..fa2aa04 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -34,7 +34,7 @@ jobs: - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index e9a4537..3afec52 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -35,7 +35,7 @@ jobs: - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index bae9216..2f7d7a7 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -34,7 +34,7 @@ jobs: - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/justfile b/justfile index 9cd8b78..4307956 100644 --- a/justfile +++ b/justfile @@ -23,3 +23,8 @@ bare-ignore: lint: unused-imports incomplete-defs bare-ignore tox -n qa + +uncomm: + git status -uall --ignored + +# Custom commands can be added below this comment