From dfc1cb1d4e01876df55afc8eedd284a10b921a0c Mon Sep 17 00:00:00 2001
From: Dominic Davis-Foster <dominic@davis-foster.co.uk>
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 <dominic@davis-foster.co.uk>
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 %}
 	<link href="{{ pathto("_static/style.css", True) }}" rel="stylesheet" type="text/css">
+	<link rel=icon href=https://python-formate.github.io/assets/formate.ico sizes="48x48" type="image/vnd.microsoft.icon">
 {% 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
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
N002ovPDHLkV1g-G`&0k`

literal 0
HcmV?d00001

diff --git a/doc-source/getting-started.rst b/doc-source/getting-started.rst
index 052b182..24d2053 100644
--- a/doc-source/getting-started.rst
+++ b/doc-source/getting-started.rst
@@ -49,7 +49,7 @@ With bash:
 
 .. code-block:: bash
 
-	(repo-helper) $
+	(formate) $
 
 
 .. _GitHub: https://github.com/
diff --git a/pyproject.toml b/pyproject.toml
index 16db69b..0eaa546 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "whey"
 [project]
 name = "contributing"
 version = "2021.0.0"
-description = "Contributing guide for repo-helper and associated projects"
+description = "Contributing guide for projects in the python-formate organization"
 readme = "README.rst"
 keywords = []
 dynamic = [ "requires-python", "classifiers", "dependencies",]
@@ -18,10 +18,10 @@ name = "Dominic Davis-Foster"
 email = "dominic@davis-foster.co.uk"
 
 [project.urls]
-Homepage = "https://github.com/repo-helper/contributing"
-"Issue Tracker" = "https://github.com/repo-helper/contributing/issues"
-"Source Code" = "https://github.com/repo-helper/contributing"
-Documentation = "https://contributing.repo-helper.uk"
+Homepage = "https://github.com/python-formate/contributing"
+"Issue Tracker" = "https://github.com/python-formate/contributing/issues"
+"Source Code" = "https://github.com/python-formate/contributing"
+Documentation = "https://contributing-to-formate.readthedocs.io"
 
 [tool.whey]
 base-classifiers = []
@@ -33,7 +33,7 @@ license-key = "MIT"
 [tool.importcheck]
 
 [tool.sphinx-pyproject]
-github_username = "repo-helper"
+github_username = "python-formate"
 github_repository = "contributing"
 author = "Dominic Davis-Foster"
 project = "contributing"
diff --git a/repo_helper.yml b/repo_helper.yml
index 902445b..4e2b1b4 100644
--- a/repo_helper.yml
+++ b/repo_helper.yml
@@ -4,11 +4,11 @@ modname: 'contributing'
 copyright_years: '2020-2021'
 author: 'Dominic Davis-Foster'
 email: 'dominic@davis-foster.co.uk'
-username: 'repo-helper'
+username: 'python-formate'
 assignee: 'domdfcoding'
 version: '2021.0.0'
 license: 'MIT'
-short_desc: 'Contributing guide for repo-helper and associated projects'
+short_desc: 'Contributing guide for projects in the python-formate organization'
 
 use_whey: True
 docs_fail_on_warning: true
@@ -16,7 +16,7 @@ sphinx_html_theme: furo
 enable_tests: false
 enable_conda: false
 on_pypi: false
-docs_url: https://contributing.repo-helper.uk
+docs_url: https://contributing-to-formate.readthedocs.io
 
 python_versions:
  - '3.8'
@@ -25,7 +25,8 @@ sphinx_conf_epilogue:
  - nitpicky = True
  - del version
  - del release
- - html_title = "repo-helper Contributing Guide"
+ - html_title = "formate Contributing Guide"
+ - html_logo = "formate.png"
 
 extra_sphinx_extensions:
  - html_section
@@ -34,3 +35,5 @@ exclude_files:
  - contributing
  - Source_rst
  - license_rst
+
+preserve_custom_theme: true

From 644e077cc88f1ab6fca230b55c3c8ad458993c06 Mon Sep 17 00:00:00 2001
From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 15:09:57 +0000
Subject: [PATCH 2/2] Updated files with 'repo_helper'.

---
 .pre-commit-config.yaml     | 7 +++++--
 doc-source/requirements.txt | 1 +
 tox.ini                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a820125..61e6a2c 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.5.0
+   rev: v0.6.0
    hooks:
     - id: requirements-txt-sorter
       args:
@@ -80,12 +80,15 @@ repos:
     - id: snippet-fmt
 
  - repo: https://github.com/python-formate/formate
-   rev: v1.1.2
+   rev: v1.2.0
    hooks:
     - id: formate
       exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
       additional_dependencies:
        - formate-trailing-commas>=0.1.1
+      types_or:
+       - python
+       - pyi
 
  - repo: https://github.com/python-coincidence/dep_checker
    rev: v0.9.0
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
index f625fff..2d345e3 100644
--- a/doc-source/requirements.txt
+++ b/doc-source/requirements.txt
@@ -5,6 +5,7 @@ furo==2021.06.18b36
 html-section>=0.3.0
 roman>=4.0
 seed-intersphinx-mapping>=1.2.2
+setuptools<81
 sphinx>=3.0.3
 sphinx-copybutton>=0.2.12
 sphinx-debuginfo>=0.2.2
diff --git a/tox.ini b/tox.ini
index 7be7ac9..2465dcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ requires =
     pip>=21,!=22.2
     tox-envlist>=0.2.1
     tox~=3.0
-    virtualenv!=20.16.0
+    virtualenv!=20.16.0,<20.39
 
 [envlists]
 test = py38