Skip to content

Commit

Permalink
Merge branch 'master' into compatible-with-wsgi
Browse files Browse the repository at this point in the history
  • Loading branch information
intgr authored Aug 3, 2023
2 parents 0e2df5b + 45bfe05 commit 28f97e2
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 7 deletions.
8 changes: 7 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: check-merge-conflict
- id: end-of-file-fixer
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.281
rev: v0.0.282
hooks:
- id: ruff
args: ["--fix", "--exit-non-zero-on-fix"]
Expand All @@ -30,6 +30,12 @@ repos:
- flake8-pyi==23.5.0
types: []
files: ^.*.pyi?$
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
hooks:
- id: codespell
additional_dependencies:
- tomli

ci:
autofix_commit_msg: '[pre-commit.ci] auto fixes from pre-commit.com hooks'
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Additionally, the following resources might be useful:
### Repository Setup

As a first step you will need to fork this repository and clone your fork locally.
In order to be able to continously sync your fork with the origin repository's master branch, you will need to set up an upstream master. To do so follow this [official github guide](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).
In order to be able to continuously sync your fork with the origin repository's master branch, you will need to set up an upstream master. To do so follow this [official github guide](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).

### Dependency Setup

Expand Down
2 changes: 1 addition & 1 deletion django-stubs/db/models/fields/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
To understand this example you need:
1. Be familiar with descriptors: https://docs.python.org/3/howto/descriptor.html
2. Follow our explanation bellow
2. Follow our explanation below
Let's start with defining our fake model class and fake integer field.
Expand Down
4 changes: 2 additions & 2 deletions django_stubs_ext/tests/test_monkeypatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_patched_version_specific(
django_version: _VersionSpec,
make_generic_classes: _MakeGenericClasses,
) -> None:
"""Test version speicific types."""
"""Test version specific types."""
make_generic_classes(django_version)

for el in _need_generic:
Expand All @@ -116,7 +116,7 @@ def test_mypy_builtins_not_patched_globally(
) -> None:
"""Ensures that builtins are not patched with `mypy` specific helpers.
This should only happend during `django.setup()`
This should only happen during `django.setup()`
(https://github.com/typeddjango/django-stubs/issues/609).
"""
make_generic_classes(include_builtins=False)
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ target-version = ['py38']
line-length = 120
include = '\.pyi?$'

[tool.codespell]
ignore-words-list = "aadd,acount,nam"

[tool.ruff]
# Adds to default excludes: https://ruff.rs/docs/settings/#exclude
extend-exclude = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/stubtest/allowlist.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a true allow list with things that we really don't care about.
# `stubtest.generated.txt` is autogenerated by `stubtest --generate-allowlist`
# and might cointain actual problems and things that we *do want* to fix.
# and might contain actual problems and things that we *do want* to fix.
#
# Please, move things here when you are sure that they really should be ignored.
# Comments about why things are ignored are mandatory.
Expand Down
2 changes: 1 addition & 1 deletion tests/typecheck/managers/querysets/test_from_queryset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
#
# For details see: https://github.com/typeddjango/django-stubs/issues/1022
- case: from_queryset_custom_auth_user_model
# Cache needs to be disabled to consistenly reproduce the bug
# Cache needs to be disabled to consistently reproduce the bug
disable_cache: true
main: |
from users.models import User
Expand Down

0 comments on commit 28f97e2

Please sign in to comment.