Updated files with 'repo_helper'.

repo-helper · Apr 26, 2024 · 652c5f5 · 652c5f5
1 parent 7912662
commit 652c5f5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 37 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -18,8 +18,8 @@ permissions:
 
 jobs:
   tests:
-    name: "macos-latest / Python ${{ matrix.config.python-version }}"
-    runs-on: "macos-latest"
+    name: "macos-13 / Python ${{ matrix.config.python-version }}"
+    runs-on: "macos-13"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
       USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12'

diff --git 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
 
@@ -43,7 +43,7 @@ repos:
     - id: bind-requirements
 
  - repo: https://github.com/domdfcoding/flake8-dunder-all
-   rev: v0.3.1
+   rev: v0.4.1
    hooks:
     - id: ensure-dunder-all
       files: ^repo_helper_bot/.*\.py$

diff --git 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"
@@ -51,3 +47,7 @@ known_third_party = [
     "werkzeug",
 ]
 known_first_party = [ "repo_helper_bot",]
+
+[config]
+indent = "	"
+line_length = 115
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,6 @@ dynamic = [ "dependencies",]
 name = "Dominic Davis-Foster"
 email = "dominic@davis-foster.co.uk"
 
-
 [project.license]
 file = "LICENSE"
 
@@ -66,6 +65,16 @@ show_error_codes = true
 [tool.snippet-fmt]
 directives = [ "code-block",]
 
+[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.setuptools]
 zip-safe = false
 include-package-data = true
@@ -79,13 +88,3 @@ github3_py = "github3"
 
 [tool.dependency-dash."requirements.txt"]
 order = 10
-
-[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
@@ -39,16 +39,13 @@ setenv =
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
-    GITHUBAPP_ID=1234
-    GITHUBAPP_SECRET=abc123
-    GITHUBAPP_KEY=ABCDEFG
-    RH_BOT_IMPORTCHECK=1
 
 [testenv:build]
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
     PIP_PREFER_BINARY=1
+    UNSAFE_PYO3_SKIP_VERSION_CHECK=1
 skip_install = True
 changedir = {toxinidir}
 deps =
@@ -76,7 +73,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