Merge branch 'master' into add-3.11

This commit is contained in:
Jelmer 2023-06-15 15:29:01 +02:00 committed by GitHub
commit 6c7afb3b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 11 deletions

View file

@ -1,4 +1,4 @@
# http://editorconfig.org
# https://editorconfig.org
root = true

View file

@ -1,6 +1,6 @@
repos:
- repo: https://github.com/PyCQA/isort
rev: 5.11.1
rev: 5.12.0
hooks:
- id: isort
args: ['--profile', 'black', '--check-only', '--diff']

View file

@ -1,6 +1,11 @@
Changelog
=========
To be released
--------
- Confirm support for `Django 4.2`
4.3.1 (2022-11-15)
------------------
@ -250,7 +255,7 @@ Changelog
for the report. Thanks Matthew Schinckel for the fix. Merge of GH-130,
fixes GH-83.
.. _IPython: http://ipython.org/
.. _IPython: https://ipython.org/
2.0.3 (2014.03.19)

View file

@ -9,7 +9,7 @@ BUILDDIR = _build
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/)
endif
# Internal variables.

View file

@ -56,7 +56,7 @@ if errorlevel 9009 (
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/
echo.https://sphinx-doc.org/
exit /b 1
)

View file

@ -84,7 +84,7 @@ If you don't explicitly call ``select_subclasses()`` or ``get_subclass()``,
an ``InheritanceManager`` behaves identically to a normal ``Manager``; so
it's safe to use as your default manager for the model.
.. _contributed by Jeff Elmore: http://jeffelmore.org/2010/11/11/automatic-downcasting-of-inherited-models-in-django/
.. _contributed by Jeff Elmore: https://jeffelmore.org/2010/11/11/automatic-downcasting-of-inherited-models-in-django/
JoinManager
-----------

View file

@ -20,4 +20,4 @@ Dependencies
``django-model-utils`` supports `Django`_ 3.2+ (latest bugfix
release in each series only) on Python 3.7+.
.. _Django: http://www.djangoproject.com/
.. _Django: https://www.djangoproject.com/

View file

@ -371,7 +371,7 @@ like in example above, but does not help when model ``save`` method is overridde
class MyModel(models.Model)
name = models.CharField(max_length=64)
tracker = FieldsTracker()
tracker = FieldTracker()
def save(self): # erroneous implementation
self.name = self.name.replace(' ', '_')

View file

@ -48,6 +48,7 @@ setup(
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
],
zip_safe=False,
package_data={

View file

@ -1,7 +1,7 @@
[tox]
envlist =
py{37,38,39,310,311,312}-dj32
py{38,39,310,311,312}-dj{40,41,main}
py{37,38,39,310}-dj32
py{38,39,310,311,312}-dj{40,41,42,main}
flake8
isort
@ -21,6 +21,7 @@ deps =
dj32: Django==3.2.*
dj40: Django==4.0.*
dj41: Django==4.1.*
dj42: Django==4.2.*
djmain: https://github.com/django/django/archive/main.tar.gz
ignore_outcome =
djmain: True
@ -33,7 +34,7 @@ passenv =
DB_*
usedevelop = True
commands =
pytest {posargs}
python -m pytest {posargs}
[testenv:flake8]
basepython =