Bladeren bron

Update and unpin black

Tulir Asokan 3 jaren geleden
bovenliggende
commit
c4f7c975f8
4 gewijzigde bestanden met toevoegingen van 7 en 11 verwijderingen
  1. 1 1
      .github/workflows/python-lint.yml
  2. 5 8
      .pre-commit-config.yaml
  3. 1 1
      dev-requirements.txt
  4. 0 1
      pyproject.toml

+ 1 - 1
.github/workflows/python-lint.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: psf/black@stable
       with:
         src: "./mausignald ./mautrix_signal"
-        version: "22.1.0"
+        version: "22.3.0"
     - name: pre-commit
       run: |
         pip install pre-commit

+ 5 - 8
.pre-commit-config.yaml

@@ -7,17 +7,14 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
-  # TODO convert to use the upstream psf/black when
-  # https://github.com/psf/black/issues/2493 gets fixed
-  - repo: local
+  - repo: https://github.com/psf/black
+    rev: 22.3.0
     hooks:
       - id: black
-        name: black
-        entry: black --check
-        language: system
-        files: ^(mausignald|mautrix_signal)/.*\.py$
+        language_version: python3
+        files: ^(mausignald|mautrix_signal)/.*\.pyi?$
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
       - id: isort
-        files: ^(mausignald|mautrix_signal)/.*$
+        files: ^(mausignald|mautrix_signal)/.*\.pyi?$

+ 1 - 1
dev-requirements.txt

@@ -1,3 +1,3 @@
 pre-commit>=2.10.1,<3
 isort>=5.10.1,<6
-black==22.1.0
+black>=22.3,<23

+ 0 - 1
pyproject.toml

@@ -9,4 +9,3 @@ line_length = 99
 [tool.black]
 line-length = 99
 target-version = ["py38"]
-required-version = "22.1.0"