From afebe96908758666673421f143493b9f8af5d09f Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Sun, 30 Jan 2022 16:28:14 +0100 Subject: [PATCH 1/6] Use reusable pre-commit workflow --- .github/workflows/test.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77acd8311..3fa81eae1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,23 +9,9 @@ on: jobs: lint: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ['3.9'] - steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - pip install -U pip setuptools wheel - pip install -r ./requirements.txt - - - name: Run pre-commit - run: pre-commit install && pre-commit run --all-files + uses: less-action/reusables/.github/workflows/pre-commit.yaml@v1 + with: + python-version: '3.9' test: runs-on: ubuntu-latest From c1c6ffaa2b9763e34c0b17b2d395bbb1924adb12 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Sun, 30 Jan 2022 16:41:29 +0100 Subject: [PATCH 2/6] Use pre-commit/mirrors-mypy --- .pre-commit-config.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1ab93c84..dec7c259c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,12 +27,13 @@ repos: rev: 3.9.2 hooks: - id: flake8 - - repo: local + - repo: https://github.com/pre-commit/mirrors-mypy + rev: v0.931 hooks: - id: mypy - name: mypy - entry: mypy - language: system - types: [ python ] - exclude: "scripts/*" args: [ "--cache-dir=/dev/null", "--no-incremental" ] + exclude: "scripts/*" + additional_dependencies: + - pytest + - djangorestframework + - types-pytz From 440e5695fbf5a3c328aa7bff76d9add2c6fa1ee4 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Sun, 30 Jan 2022 16:46:45 +0100 Subject: [PATCH 3/6] mypy dependencies --- .pre-commit-config.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dec7c259c..b5a0f7a28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,3 +37,10 @@ repos: - pytest - djangorestframework - types-pytz + - django-stubs + - typing-extensions + - requests + - coreapi + - types-requests + - types-PyYAML + - types-Markdown From a508236f01b0e7a957b46801deec0fcec42faf45 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Mon, 14 Feb 2022 20:27:42 +0100 Subject: [PATCH 4/6] pin reusable to commit sha --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3fa81eae1..7a006c2fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: jobs: lint: - uses: less-action/reusables/.github/workflows/pre-commit.yaml@v1 + uses: less-action/reusables/.github/workflows/pre-commit.yaml@459cad5ac9877a76911718423b348249a20ce75d with: python-version: '3.9' From 2e87e2dc0ab13256cafc3eff3473deb1135fe0ba Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Mon, 14 Feb 2022 20:50:02 +0100 Subject: [PATCH 5/6] fix pre-commit hook, remove unnecessary dependencies --- .pre-commit-config.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b5a0f7a28..a33faeca0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,15 +32,8 @@ repos: hooks: - id: mypy args: [ "--cache-dir=/dev/null", "--no-incremental" ] - exclude: "scripts/*" + exclude: "scripts/" + types: [python] additional_dependencies: - - pytest - djangorestframework - - types-pytz - django-stubs - - typing-extensions - - requests - - coreapi - - types-requests - - types-PyYAML - - types-Markdown From 21b6a39ebc775ac88b3233f228cd0c54d5a17664 Mon Sep 17 00:00:00 2001 From: Anton Agestam Date: Mon, 14 Feb 2022 21:14:15 +0100 Subject: [PATCH 6/6] Bump pre-commit hooks (autoupdate) --- .pre-commit-config.yaml | 6 +++--- rest_framework-stubs/compat.pyi | 1 + rest_framework-stubs/serializers.pyi | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a33faeca0..425a2a485 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,16 +11,16 @@ repos: - id: check-merge-conflict - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v2.29.1 + rev: v2.31.0 hooks: - id: pyupgrade args: ["--py36-plus"] - repo: https://github.com/pre-commit/mirrors-isort - rev: v5.9.3 + rev: v5.10.1 hooks: - id: isort - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 diff --git a/rest_framework-stubs/compat.pyi b/rest_framework-stubs/compat.pyi index 4e151eec2..a036ee1b3 100644 --- a/rest_framework-stubs/compat.pyi +++ b/rest_framework-stubs/compat.pyi @@ -38,6 +38,7 @@ except ImportError: if markdown is not None and pygments is not None: from markdown.preprocessors import Preprocessor + class CodeBlockPreprocessor(Preprocessor): pattern: Any = ... formatter: Any = ... diff --git a/rest_framework-stubs/serializers.pyi b/rest_framework-stubs/serializers.pyi index 2f6d8c7c2..e4a1f3454 100644 --- a/rest_framework-stubs/serializers.pyi +++ b/rest_framework-stubs/serializers.pyi @@ -219,6 +219,7 @@ class ModelSerializer(Serializer, BaseSerializer[_MT]): serializer_choice_field: Type[Field] = ... url_field_name: Optional[str] = ... instance: Optional[Union[_MT, Sequence[_MT]]] # type: ignore[override] + class Meta: model: Type[_MT] # type: ignore fields: Union[Sequence[str], Literal["__all__"]]