Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-model-utils for
openSUSE:Factory checked in at 2023-01-04 17:53:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-model-utils (Old)
and /work/SRC/openSUSE:Factory/.python-django-model-utils.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-model-utils"
Wed Jan 4 17:53:53 2023 rev:8 rq:1055879 version:4.3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-model-utils/python-django-model-utils.changes
2022-01-07 12:48:01.595914009 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-model-utils.new.1563/python-django-model-utils.changes
2023-01-04 17:54:41.110918063 +0100
@@ -1,0 +2,12 @@
+Wed Jan 4 14:46:35 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 4.3.1:
+ * Confirm support for `Django 4.0`
+ * Add Spanish translation
+ * Add French translation
+ * Drop Django 1.7 workaround from `select_subclasses()`
+ * Drop support for `Django < 3.2`
+ * Drop support for `Python 3.6`
+ * Confirm support for `Django 4.1`
+
+-------------------------------------------------------------------
Old:
----
django-model-utils-4.2.0.tar.gz
New:
----
django-model-utils-4.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-model-utils.spec ++++++
--- /var/tmp/diff_new_pack.O3SOcE/_old 2023-01-04 17:54:41.538920586 +0100
+++ /var/tmp/diff_new_pack.O3SOcE/_new 2023-01-04 17:54:41.546920633 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-django-model-utils
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define skip_python2 1
%define skip_python36 1
Name: python-django-model-utils
-Version: 4.2.0
+Version: 4.3.1
Release: 0
Summary: Django model mixins and utilities
License: BSD-3-Clause
@@ -31,8 +31,8 @@
BuildRequires: %{python_module Django >= 2.0}
BuildRequires: %{python_module freezegun}
BuildRequires: %{python_module pytest-django}
-BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module setuptools_scm}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
Requires: python-Django >= 2.0
BuildArch: noarch
++++++ django-model-utils-4.2.0.tar.gz -> django-model-utils-4.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/.github/workflows/test.yml
new/django-model-utils-4.3.1/.github/workflows/test.yml
--- old/django-model-utils-4.2.0/.github/workflows/test.yml 2021-10-11
10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/.github/workflows/test.yml 2022-11-16
01:12:36.000000000 +0100
@@ -9,11 +9,11 @@
fail-fast: false
max-parallel: 5
matrix:
- python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.7', '3.8', '3.9', '3.10']
services:
postgres:
- image: postgres:10
+ image: postgres:12
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/.pre-commit-config.yaml
new/django-model-utils-4.3.1/.pre-commit-config.yaml
--- old/django-model-utils-4.2.0/.pre-commit-config.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/django-model-utils-4.3.1/.pre-commit-config.yaml 2022-11-16
01:12:36.000000000 +0100
@@ -0,0 +1,20 @@
+repos:
+ - repo: https://github.com/PyCQA/isort
+ rev: 5.10.1
+ hooks:
+ - id: isort
+ args: ['--profile', 'black', '--check-only', '--diff']
+ files: ^((model_utils|tests)/)|setup.py
+
+ - repo: https://github.com/PyCQA/flake8
+ rev: 5.0.4
+ hooks:
+ - id: flake8
+ args: ['--ignore=E402,E501,E731,W503']
+ files: ^(model_utils|tests)/
+
+ - repo: https://github.com/asottile/pyupgrade
+ rev: v3.1.0
+ hooks:
+ - id: pyupgrade
+ args: [--py37-plus]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/AUTHORS.rst
new/django-model-utils-4.3.1/AUTHORS.rst
--- old/django-model-utils-4.2.0/AUTHORS.rst 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/AUTHORS.rst 2022-11-16 01:12:36.000000000
+0100
@@ -25,10 +25,12 @@
| Donald Stufft <[email protected]>
| Douglas Meehan <[email protected]>
| Emin Bugra Saral <[email protected]>
+| Enrique MatÃas Sánchez <[email protected]>
| Eran Rundstein <[email protected]>
| Eugene Kuznetsov <[email protected]>
| Felipe Prenholato <[email protected]>
| Filipe Ximenes <[email protected]>
+| Florian Alu <[email protected]>
| Germano Massullo <github.com/Germano0>
| Gregor Müllegger <[email protected]>
| Guilherme Devincenzi <github.com/gdevincenzi>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/CHANGES.rst
new/django-model-utils-4.3.1/CHANGES.rst
--- old/django-model-utils-4.2.0/CHANGES.rst 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/CHANGES.rst 2022-11-16 01:12:36.000000000
+0100
@@ -1,9 +1,21 @@
Changelog
=========
-Unreleased
-----------
+4.3.1 (2022-11-15)
+------------------
+
+- Confirm support for `Django 4.0`
+- Add Spanish translation
+- Add French translation
+- Drop Django 1.7 workaround from `select_subclasses()`
+- Drop support for `Django < 3.2`
+- Drop support for `Python 3.6`
+- Confirm support for `Django 4.1`
+
+4.3.0
+-----
+- Never released due to packaging issues.
4.2.0 (2021-10-11)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/CODE_OF_CONDUCT.md
new/django-model-utils-4.3.1/CODE_OF_CONDUCT.md
--- old/django-model-utils-4.2.0/CODE_OF_CONDUCT.md 1970-01-01
01:00:00.000000000 +0100
+++ new/django-model-utils-4.3.1/CODE_OF_CONDUCT.md 2022-11-16
01:12:36.000000000 +0100
@@ -0,0 +1,46 @@
+# Code of Conduct
+
+As contributors and maintainers of the Jazzband projects, and in the interest
of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in the Jazzband a harassment-free
experience
+for everyone, regardless of the level of experience, gender, gender identity
and
+expression, sexual orientation, disability, personal appearance, body size,
race,
+ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery
+- Personal attacks
+- Trolling or insulting/derogatory comments
+- Public or private harassment
+- Publishing other's private information, such as physical or electronic
addresses,
+ without explicit permission
+- Other unethical or unprofessional conduct
+
+The Jazzband roadies have the right and responsibility to remove, edit, or
reject
+comments, commits, code, wiki edits, issues, and other contributions that are
not
+aligned to this Code of Conduct, or to ban temporarily or permanently any
contributor
+for other behaviors that they deem inappropriate, threatening, offensive, or
harmful.
+
+By adopting this Code of Conduct, the roadies commit themselves to fairly and
+consistently applying these principles to every aspect of managing the jazzband
+projects. Roadies who do not follow or enforce the Code of Conduct may be
permanently
+removed from the Jazzband roadies.
+
+This code of conduct applies both within project spaces and in public spaces
when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by
+contacting the roadies at `[email protected]`. All complaints will be
reviewed and
+investigated and will result in a response that is deemed necessary and
appropriate to
+the circumstances. Roadies are obligated to maintain confidentiality with
regard to the
+reporter of an incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version
+1.3.0, available at [https://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/3/0/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/PKG-INFO
new/django-model-utils-4.3.1/PKG-INFO
--- old/django-model-utils-4.2.0/PKG-INFO 2021-10-11 10:02:43.739770400
+0200
+++ new/django-model-utils-4.3.1/PKG-INFO 2022-11-16 01:12:51.504931000
+0100
@@ -1,13 +1,12 @@
Metadata-Version: 2.1
Name: django-model-utils
-Version: 4.2.0
+Version: 4.3.1
Summary: Django model mixins and utilities
Home-page: https://github.com/jazzband/django-model-utils
Author: Carl Meyer
Author-email: [email protected]
Maintainer: JazzBand
License: BSD
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Web Environment
Classifier: Intended Audience :: Developers
@@ -15,15 +14,15 @@
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Framework :: Django
-Classifier: Framework :: Django :: 2.2
-Classifier: Framework :: Django :: 3.1
Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.1
+Requires-Python: >=3.7
Description-Content-Type: text/x-rst
License-File: LICENSE.txt
License-File: AUTHORS.rst
@@ -50,9 +49,9 @@
Django model mixins and utilities.
-``django-model-utils`` supports `Django`_ 2.2+.
+``django-model-utils`` supports `Django`_ 3.2+.
-.. _Django: http://www.djangoproject.com/
+.. _Django: https://www.djangoproject.com/
This app is available on `PyPI`_.
@@ -87,9 +86,21 @@
Changelog
=========
-Unreleased
-----------
+4.3.1 (2022-11-15)
+------------------
+
+- Confirm support for `Django 4.0`
+- Add Spanish translation
+- Add French translation
+- Drop Django 1.7 workaround from `select_subclasses()`
+- Drop support for `Django < 3.2`
+- Drop support for `Python 3.6`
+- Confirm support for `Django 4.1`
+
+4.3.0
+-----
+- Never released due to packaging issues.
4.2.0 (2021-10-11)
------------------
@@ -561,5 +572,3 @@
-----
- Added ``QueryManager``
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/README.rst
new/django-model-utils-4.3.1/README.rst
--- old/django-model-utils-4.2.0/README.rst 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/README.rst 2022-11-16 01:12:36.000000000
+0100
@@ -20,9 +20,9 @@
Django model mixins and utilities.
-``django-model-utils`` supports `Django`_ 2.2+.
+``django-model-utils`` supports `Django`_ 3.2+.
-.. _Django: http://www.djangoproject.com/
+.. _Django: https://www.djangoproject.com/
This app is available on `PyPI`_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/django_model_utils.egg-info/PKG-INFO
new/django-model-utils-4.3.1/django_model_utils.egg-info/PKG-INFO
--- old/django-model-utils-4.2.0/django_model_utils.egg-info/PKG-INFO
2021-10-11 10:02:43.000000000 +0200
+++ new/django-model-utils-4.3.1/django_model_utils.egg-info/PKG-INFO
2022-11-16 01:12:51.000000000 +0100
@@ -1,13 +1,12 @@
Metadata-Version: 2.1
Name: django-model-utils
-Version: 4.2.0
+Version: 4.3.1
Summary: Django model mixins and utilities
Home-page: https://github.com/jazzband/django-model-utils
Author: Carl Meyer
Author-email: [email protected]
Maintainer: JazzBand
License: BSD
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Web Environment
Classifier: Intended Audience :: Developers
@@ -15,15 +14,15 @@
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Framework :: Django
-Classifier: Framework :: Django :: 2.2
-Classifier: Framework :: Django :: 3.1
Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.1
+Requires-Python: >=3.7
Description-Content-Type: text/x-rst
License-File: LICENSE.txt
License-File: AUTHORS.rst
@@ -50,9 +49,9 @@
Django model mixins and utilities.
-``django-model-utils`` supports `Django`_ 2.2+.
+``django-model-utils`` supports `Django`_ 3.2+.
-.. _Django: http://www.djangoproject.com/
+.. _Django: https://www.djangoproject.com/
This app is available on `PyPI`_.
@@ -87,9 +86,21 @@
Changelog
=========
-Unreleased
-----------
+4.3.1 (2022-11-15)
+------------------
+
+- Confirm support for `Django 4.0`
+- Add Spanish translation
+- Add French translation
+- Drop Django 1.7 workaround from `select_subclasses()`
+- Drop support for `Django < 3.2`
+- Drop support for `Python 3.6`
+- Confirm support for `Django 4.1`
+
+4.3.0
+-----
+- Never released due to packaging issues.
4.2.0 (2021-10-11)
------------------
@@ -561,5 +572,3 @@
-----
- Added ``QueryManager``
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/django_model_utils.egg-info/SOURCES.txt
new/django-model-utils-4.3.1/django_model_utils.egg-info/SOURCES.txt
--- old/django-model-utils-4.2.0/django_model_utils.egg-info/SOURCES.txt
2021-10-11 10:02:43.000000000 +0200
+++ new/django-model-utils-4.3.1/django_model_utils.egg-info/SOURCES.txt
2022-11-16 01:12:51.000000000 +0100
@@ -1,8 +1,10 @@
.coveragerc
.editorconfig
.gitignore
+.pre-commit-config.yaml
AUTHORS.rst
CHANGES.rst
+CODE_OF_CONDUCT.md
CONTRIBUTING.rst
LICENSE.txt
MANIFEST.in
@@ -44,8 +46,12 @@
model_utils/locale/cs/LC_MESSAGES/django.po
model_utils/locale/de/LC_MESSAGES/django.mo
model_utils/locale/de/LC_MESSAGES/django.po
+model_utils/locale/es/LC_MESSAGES/django.mo
+model_utils/locale/es/LC_MESSAGES/django.po
model_utils/locale/fa/LC_MESSAGES/django.mo
model_utils/locale/fa/LC_MESSAGES/django.po
+model_utils/locale/fr/LC_MESSAGES/django.mo
+model_utils/locale/fr/LC_MESSAGES/django.po
model_utils/locale/ru/LC_MESSAGES/django.mo
model_utils/locale/ru/LC_MESSAGES/django.po
model_utils/locale/zh_Hans/LC_MESSAGES/django.mo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/django_model_utils.egg-info/requires.txt
new/django-model-utils-4.3.1/django_model_utils.egg-info/requires.txt
--- old/django-model-utils-4.2.0/django_model_utils.egg-info/requires.txt
2021-10-11 10:02:43.000000000 +0200
+++ new/django-model-utils-4.3.1/django_model_utils.egg-info/requires.txt
2022-11-16 01:12:51.000000000 +0100
@@ -1 +1 @@
-Django>=2.0.1
+Django>=3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/docs/managers.rst
new/django-model-utils-4.3.1/docs/managers.rst
--- old/django-model-utils-4.2.0/docs/managers.rst 2021-10-11
10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/docs/managers.rst 2022-11-16
01:12:36.000000000 +0100
@@ -6,7 +6,7 @@
This manager (`contributed by Jeff Elmore`_) should be attached to a base model
class in a model-inheritance tree. It allows queries on that base model to
-return heterogenous results of the actual proper subtypes, without any
+return heterogeneous results of the actual proper subtypes, without any
additional queries.
For instance, if you have a ``Place`` model with subclasses ``Restaurant`` and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/docs/setup.rst
new/django-model-utils-4.3.1/docs/setup.rst
--- old/django-model-utils-4.2.0/docs/setup.rst 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/docs/setup.rst 2022-11-16 01:12:36.000000000
+0100
@@ -17,7 +17,7 @@
Dependencies
============
-``django-model-utils`` supports `Django`_ 2.2, 3.1 and 3.2 (latest bugfix
-release in each series only) on Python 3.6+.
+``django-model-utils`` supports `Django`_ 3.2+ (latest bugfix
+release in each series only) on Python 3.7+.
.. _Django: http://www.djangoproject.com/
Binary files
old/django-model-utils-4.2.0/model_utils/locale/es/LC_MESSAGES/django.mo and
new/django-model-utils-4.3.1/model_utils/locale/es/LC_MESSAGES/django.mo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/model_utils/locale/es/LC_MESSAGES/django.po
new/django-model-utils-4.3.1/model_utils/locale/es/LC_MESSAGES/django.po
--- old/django-model-utils-4.2.0/model_utils/locale/es/LC_MESSAGES/django.po
1970-01-01 01:00:00.000000000 +0100
+++ new/django-model-utils-4.3.1/model_utils/locale/es/LC_MESSAGES/django.po
2022-11-16 01:12:36.000000000 +0100
@@ -0,0 +1,43 @@
+# This file is distributed under the same license as the django-model-utils
package.
+#
+# Translators:
+# Enrique MatÃas Sánchez <[email protected]>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: django-model-utils\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-03-29 10:59+0200\n"
+"PO-Revision-Date: 2020-03-29 11:14+0100\n"
+"Last-Translator: Enrique MatÃas Sánchez <[email protected]>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: models.py:28
+msgid "created"
+msgstr "creado"
+
+#: models.py:29
+msgid "modified"
+msgstr "modificado"
+
+#: models.py:51
+msgid "start"
+msgstr "inicio"
+
+#: models.py:52
+msgid "end"
+msgstr "fin"
+
+#: models.py:67
+msgid "status"
+msgstr "estado"
+
+#: models.py:68
+msgid "status changed"
+msgstr "estado modificado"
+
Binary files
old/django-model-utils-4.2.0/model_utils/locale/fr/LC_MESSAGES/django.mo and
new/django-model-utils-4.3.1/model_utils/locale/fr/LC_MESSAGES/django.mo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/model_utils/locale/fr/LC_MESSAGES/django.po
new/django-model-utils-4.3.1/model_utils/locale/fr/LC_MESSAGES/django.po
--- old/django-model-utils-4.2.0/model_utils/locale/fr/LC_MESSAGES/django.po
1970-01-01 01:00:00.000000000 +0100
+++ new/django-model-utils-4.3.1/model_utils/locale/fr/LC_MESSAGES/django.po
2022-11-16 01:12:36.000000000 +0100
@@ -0,0 +1,46 @@
+# French translations of django-model-utils
+#
+# This file is distributed under the same license as the django-model-utils
package.
+#
+# Translators:
+# ------------
+# Florian Alu <[email protected]>, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: django-model-utils\n"
+"Report-Msgid-Bugs-To: https://github.com/jazzband/django-model-utils/issues\n";
+"POT-Creation-Date: 2021-01-11 11:39+0100\n"
+"PO-Revision-Date: 2021-01-11 11:45+0100\n"
+"Last-Translator: Florian Alu <[email protected]>\n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.4.2\n"
+
+#: .\models.py:25
+msgid "created"
+msgstr "créé"
+
+#: .\models.py:26
+msgid "modified"
+msgstr "modifié"
+
+#: .\models.py:50
+msgid "start"
+msgstr "début"
+
+#: .\models.py:51
+msgid "end"
+msgstr "fin"
+
+#: .\models.py:66
+msgid "status"
+msgstr "statut"
+
+#: .\models.py:67
+msgid "status changed"
+msgstr "statut modifié"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/model_utils/managers.py
new/django-model-utils-4.3.1/model_utils/managers.py
--- old/django-model-utils-4.2.0/model_utils/managers.py 2021-10-11
10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/model_utils/managers.py 2022-11-16
01:12:36.000000000 +0100
@@ -72,16 +72,10 @@
)
subclasses = verified_subclasses
- # workaround https://code.djangoproject.com/ticket/16855
- previous_select_related = self.query.select_related
if subclasses:
new_qs = self.select_related(*subclasses)
else:
new_qs = self
- previous_is_dict = isinstance(previous_select_related, dict)
- new_is_dict = isinstance(new_qs.query.select_related, dict)
- if previous_is_dict and new_is_dict:
- new_qs.query.select_related.update(previous_select_related)
new_qs.subclasses = subclasses
return new_qs
@@ -145,7 +139,7 @@
"""
if not issubclass(model, self.model):
raise ValueError(
- "{!r} is not a subclass of {!r}".format(model, self.model))
+ f"{model!r} is not a subclass of {self.model!r}")
ancestry = []
# should be a OneToOneField or None
@@ -185,7 +179,7 @@
"""
Fetch only objects that are instances of the provided model(s).
"""
- # If we aren't already selecting the subclasess, we need
+ # If we aren't already selecting the subclasses, we need
# to in order to get this to work.
# How can we tell if we are not selecting subclasses?
@@ -314,7 +308,7 @@
# Put additional quotes around string.
params = [
- '\'{}\''.format(p)
+ f'\'{p}\''
if isinstance(p, str) else p
for p in params
]
@@ -331,7 +325,7 @@
to itself.
`Join` either uses the current queryset and effectively does a
self-join to
- create a new limited queryset OR it uses a querset given by the user.
+ create a new limited queryset OR it uses a queryset given by the user.
The model of a given queryset needs to contain a valid foreign key to
the current queryset to perform a join. A new queryset is then created.
@@ -344,7 +338,7 @@
if getattr(fk, 'related_model', None) == self.model
]
fk = fk[0] if fk else None
- model_set = '{}_set'.format(self.model.__name__.lower())
+ model_set = f'{self.model.__name__.lower()}_set'
key = fk or getattr(qs.model, model_set, None)
if not key:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/setup.py
new/django-model-utils-4.3.1/setup.py
--- old/django-model-utils-4.2.0/setup.py 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/setup.py 2022-11-16 01:12:36.000000000
+0100
@@ -8,7 +8,7 @@
for filename in FILES:
filepath = os.path.realpath(os.path.join(root_path, filename))
if os.path.isfile(filepath):
- with open(filepath, mode='r') as f:
+ with open(filepath) as f:
yield f.read()
@@ -29,7 +29,8 @@
maintainer='JazzBand',
url='https://github.com/jazzband/django-model-utils',
packages=find_packages(exclude=['tests*']),
- install_requires=['Django>=2.0.1'],
+ python_requires=">=3.7",
+ install_requires=['Django>=3.2'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
@@ -38,18 +39,16 @@
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Framework :: Django',
- 'Framework :: Django :: 2.2',
- 'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
+ 'Framework :: Django :: 4.0',
+ 'Framework :: Django :: 4.1',
],
zip_safe=False,
- tests_require=['Django>=2.2'],
package_data={
'model_utils': [
'locale/*/LC_MESSAGES/django.po', 'locale/*/LC_MESSAGES/django.mo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/tests/models.py
new/django-model-utils-4.3.1/tests/models.py
--- old/django-model-utils-4.2.0/tests/models.py 2021-10-11
10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/tests/models.py 2022-11-16
01:12:36.000000000 +0100
@@ -1,4 +1,3 @@
-import django
from django.db import models
from django.db.models import Manager
from django.db.models.query_utils import DeferredAttribute
@@ -387,13 +386,9 @@
return self
if self.name in obj.get_deferred_fields():
# This queries the database, and sets the value on the instance.
- if django.VERSION < (3, 0):
- DeferredAttribute(field_name=self.name).__get__(obj, cls)
- else:
- # Since Django 3.0, DeferredAttribute wants a field argument.
- fields_map = {f.name: f for f in cls._meta.fields}
- field = fields_map[self.name]
- DeferredAttribute(field=field).__get__(obj, cls)
+ fields_map = {f.name: f for f in cls._meta.fields}
+ field = fields_map[self.name]
+ DeferredAttribute(field=field).__get__(obj, cls)
return str(obj.__dict__[self.name])
def __set__(self, obj, value):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/tests/settings.py
new/django-model-utils-4.3.1/tests/settings.py
--- old/django-model-utils-4.2.0/tests/settings.py 2021-10-11
10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/tests/settings.py 2022-11-16
01:12:36.000000000 +0100
@@ -23,3 +23,5 @@
}
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+USE_TZ = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/tests/test_managers/test_join_manager.py
new/django-model-utils-4.3.1/tests/test_managers/test_join_manager.py
--- old/django-model-utils-4.2.0/tests/test_managers/test_join_manager.py
2021-10-11 10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/tests/test_managers/test_join_manager.py
2022-11-16 01:12:36.000000000 +0100
@@ -6,7 +6,7 @@
class JoinManagerTest(TestCase):
def setUp(self):
for i in range(20):
- BoxJoinModel.objects.create(name='name_{i}'.format(i=i))
+ BoxJoinModel.objects.create(name=f'name_{i}')
JoinItemForeignKey.objects.create(
weight=10, belonging=BoxJoinModel.objects.get(name='name_1')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-model-utils-4.2.0/tests/test_models/test_timestamped_model.py
new/django-model-utils-4.3.1/tests/test_models/test_timestamped_model.py
--- old/django-model-utils-4.2.0/tests/test_models/test_timestamped_model.py
2021-10-11 10:02:32.000000000 +0200
+++ new/django-model-utils-4.3.1/tests/test_models/test_timestamped_model.py
2022-11-16 01:12:36.000000000 +0100
@@ -14,7 +14,7 @@
def test_created_sets_modified(self):
'''
- Ensure that on creation that modifed is set exactly equal to created.
+ Ensure that on creation that modified is set exactly equal to created.
'''
t1 = TimeStamp.objects.create()
self.assertEqual(t1.created, t1.modified)
@@ -31,7 +31,7 @@
def
test_overriding_created_via_object_creation_also_uses_creation_date_for_modified(self):
"""
Setting the created date when first creating an object
- should be permissable.
+ should be permissible.
"""
different_date = datetime.today() - timedelta(weeks=52)
t1 = TimeStamp.objects.create(created=different_date)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-model-utils-4.2.0/tox.ini
new/django-model-utils-4.3.1/tox.ini
--- old/django-model-utils-4.2.0/tox.ini 2021-10-11 10:02:32.000000000
+0200
+++ new/django-model-utils-4.3.1/tox.ini 2022-11-16 01:12:36.000000000
+0100
@@ -1,14 +1,12 @@
[tox]
envlist =
- py{36,37,38,39}-dj{22,31,32}
- py310-dj{31,32}
- py{38,39,310}-djmain
+ py{37,38,39,310}-dj32
+ py{38,39,310}-dj{40,41,main}
flake8
isort
[gh-actions]
python =
- 3.6: py36
3.7: py37
3.8: py38, flake8, isort
3.9: py39
@@ -18,9 +16,9 @@
deps =
freezegun==0.3.12
-rrequirements-test.txt
- dj22: Django==2.2.*
- dj31: Django==3.1.*
dj32: Django==3.2.*
+ dj40: Django==4.0.*
+ dj41: Django==4.1.*
djmain: https://github.com/django/django/archive/main.tar.gz
ignore_outcome =
djmain: True
