From f12701030b01f5949fd0b5d135e28bf6c42aaed2 Mon Sep 17 00:00:00 2001 From: mfgcb <60206026+mfgcb@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:01:03 +0200 Subject: [PATCH 1/5] Update utilities.rst Fix typo FieldsTracker --> FieldTracker --- docs/utilities.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/utilities.rst b/docs/utilities.rst index b1a618d..a1d16e5 100644 --- a/docs/utilities.rst +++ b/docs/utilities.rst @@ -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(' ', '_') From cced1c7aeaf97fa6ee5c7e44c8ea827ed10b2da5 Mon Sep 17 00:00:00 2001 From: Ihor Sychevskyi Date: Sat, 28 Jan 2023 05:44:56 +0200 Subject: [PATCH 2/5] update links (#554) --- .editorconfig | 2 +- CHANGES.rst | 2 +- docs/Makefile | 2 +- docs/make.bat | 2 +- docs/managers.rst | 2 +- docs/setup.rst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 058a363..67db007 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# http://editorconfig.org +# https://editorconfig.org root = true diff --git a/CHANGES.rst b/CHANGES.rst index 09d39ca..f6cb6cc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -249,7 +249,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) diff --git a/docs/Makefile b/docs/Makefile index 452f59f..c6c45a3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -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. diff --git a/docs/make.bat b/docs/make.bat index fb1a0ef..b593358 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -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 ) diff --git a/docs/managers.rst b/docs/managers.rst index 0d07a96..54aff0a 100644 --- a/docs/managers.rst +++ b/docs/managers.rst @@ -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 ----------- diff --git a/docs/setup.rst b/docs/setup.rst index 69c9840..ad01f8a 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -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/ From 881cf29e21e22b43ae9c355b8a94709aee9101f5 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 16 Mar 2023 22:45:14 +0100 Subject: [PATCH 3/5] Run pytest with current directory in the search path Without this, `pytest-django` cannot find its settings module. https://docs.pytest.org/en/6.2.x/usage.html#calling-pytest-through-python-m-pytest --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1774e91..b4e1713 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ passenv = DB_* usedevelop = True commands = - pytest {posargs} + python -m pytest {posargs} [testenv:flake8] basepython = From e55b5e99b1165a54c8e087c6e98ec9f7ec6602e5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 19:46:55 +0000 Subject: [PATCH 4/5] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/isort: 5.11.1 → 5.12.0](https://github.com/PyCQA/isort/compare/5.11.1...5.12.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b00e484..327897b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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'] From 0167a18024e7eb224d3775894f461d3d49136af2 Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Thu, 6 Apr 2023 13:38:02 +0200 Subject: [PATCH 5/5] Test django against 4.2 & main branch to formally support django 4.2 --- CHANGES.rst | 5 +++++ setup.py | 1 + tox.ini | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f6cb6cc..88271a2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +To be released +-------- + +- Confirm support for `Django 4.2` + 4.3.1 (2022-11-15) ------------------ diff --git a/setup.py b/setup.py index 2c6f855..60ddbcb 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,7 @@ setup( 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', ], zip_safe=False, package_data={ diff --git a/tox.ini b/tox.ini index b4e1713..316ca1b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py{37,38,39,310}-dj32 - py{38,39,310}-dj{40,41,main} + py{38,39,310}-dj{40,41,42,main} flake8 isort @@ -19,6 +19,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