Merge b86df1b into 59d1953

repo-helper · Sep 14, 2021 · 6c483e4 · 6c483e4
2 parents 59d1953 + b86df1b
commit 6c483e4
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 13 deletions.
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -31,7 +31,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10.0-rc.1", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
 

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -32,7 +32,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10.0-rc.1", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
 

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.2,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -31,7 +31,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
-          - {python-version: "3.10.0-rc.1", testenvs: "py310-dev,build", experimental: True}
+          - {python-version: "3.10.0-rc.2", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,7 +51,7 @@ repos:
     - id: flake2lint
 
  - repo: https://github.com/pre-commit/pygrep-hooks
-   rev: v1.8.0
+   rev: v1.9.0
    hooks:
     - id: python-no-eval
     - id: rst-backticks

diff --git a/pyproject.toml b/pyproject.toml
@@ -155,7 +155,32 @@ check_untyped_defs = true
 warn_unused_ignores = true
 no_implicit_optional = true
 incremental = false
+show_error_codes = true
+
+[tool.snippet-fmt]
+directives = [ "code-block",]
 
 [tool.dep_checker.name_mapping]
 attrs = "attr"
 ruamel-yaml = "ruamel.yaml"
+
+[tool.dependency-dash."requirements.txt"]
+order = 10
+
+[tool.dependency-dash."tests/requirements.txt"]
+order = 20
+include = false
+
+[tool.dependency-dash."doc-source/requirements.txt"]
+order = 30
+include = false
+
+[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/repo_helper/files/linting.py b/repo_helper/files/linting.py
@@ -295,10 +295,10 @@
 		"NQA001",  # "#noqa" must have a single space after the hash, e.g. "# noqa
 		"NQA002",  # "# noqa X000" must have a colon, e.g. "# noqa: X000
 		"NQA003",  # "# noqa : X000" must not have a space before the colon, e.g. "# noqa: X000"
-		"NQA004",  # "# noqa: X000" must have at most one space before the codes, e.g. "# noqa: X000
-		"NQA005",  # "# noqa: X000, X000" has duplicate codes, remove X00
-		"NQA102",  # "# noqa: X000" has no matching violation
-		"NQA103",  # "# noqa: X000, X001" has unmatched code(s), remove X00
+		"NQA004",  # "  # noqa: X000  " must have at most one space before the codes, e.g. "# noqa: X000
+		"NQA005",  # "  # noqa: X000,X000  " has duplicate codes, remove X00
+		"NQA102",  # "  # noqa: X000  " has no matching violation
+		"NQA103",  # "  # noqa: X000,X001  " has unmatched code(s), remove X00
 		])
 
 

diff --git a/repo_helper/files/pre_commit.py b/repo_helper/files/pre_commit.py
@@ -181,8 +181,7 @@ def to_dict(self) -> MutableMapping[str, Union[str, List[Hook]]]:
 				"python-no-eval",
 				"rst-backticks",
 				"rst-directive-colons",
-				"rst-inline-touching-normal",
-				# TODO: "python-check-blanket-type-ignore",
+				"rst-inline-touching-normal",  # TODO: "python-check-blanket-type-ignore",
 				],
 		)