Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-django-reversion for openSUSE:Factory checked in at 2024-02-22 20:58:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-reversion (Old) and /work/SRC/openSUSE:Factory/.python-django-reversion.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-reversion" Thu Feb 22 20:58:46 2024 rev:15 rq:1148986 version:5.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-reversion/python-django-reversion.changes 2023-01-14 20:32:48.953601999 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-reversion.new.1706/python-django-reversion.changes 2024-02-22 20:59:33.225439976 +0100 @@ -1,0 +2,13 @@ +Thu Feb 22 06:14:57 UTC 2024 - Steve Kowalik <steven.kowa...@suse.com> + +- Update to 5.0.12: + * Improved the Chinese translation + * Fix N+1 queries while rendering the ``recover_list.html`` template + * Fix ``get_deleted`` + * Speed up ``get_deleted`` + * Fix handling case of missing object in admin revert + * Handling case of missing object in admin revert +- Switch to pyproject and autosetup macros. +- Refresh only-sqlite-test-db.patch + +------------------------------------------------------------------- Old: ---- django-reversion-5.0.4.tar.gz New: ---- django-reversion-5.0.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-reversion.spec ++++++ --- /var/tmp/diff_new_pack.qAh9IS/_old 2024-02-22 20:59:34.013468784 +0100 +++ /var/tmp/diff_new_pack.qAh9IS/_new 2024-02-22 20:59:34.013468784 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-django-reversion # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,8 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-django-reversion -Version: 5.0.4 +Version: 5.0.12 Release: 0 Summary: A Django extension that provides version control for model instances License: BSD-3-Clause @@ -28,8 +26,10 @@ Patch0: only-sqlite-test-db.patch BuildRequires: %{python_module Django > 2.0} BuildRequires: %{python_module base > 3.7} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest-django} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Django > 2.0 @@ -47,17 +47,16 @@ - Simple admin integration. %prep -%setup -q -n django-reversion-%{version} # Tests need running PGSQL and MYSQL # https://github.com/etianen/django-reversion/issues/902 -%patch0 -p1 +%autosetup -p1 -n django-reversion-%{version} sed -i 's/databases = {"default", .*"postgres"}/databases = {"default"}/' tests/test_app/tests/test_*.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -68,5 +67,6 @@ %files %{python_files} %doc README.rst CHANGELOG.rst %license LICENSE -%{python_sitelib}/*reversion*/ +%{python_sitelib}/reversion +%{python_sitelib}/django_reversion-%{version}.dist-info ++++++ django-reversion-5.0.4.tar.gz -> django-reversion-5.0.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/CHANGELOG.rst new/django-reversion-5.0.12/CHANGELOG.rst --- old/django-reversion-5.0.4/CHANGELOG.rst 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/CHANGELOG.rst 2024-01-30 21:05:40.000000000 +0100 @@ -3,6 +3,55 @@ django-reversion changelog ========================== +5.0.12 - 2024-01-30 +------------------- + +- Fix missing migration introduced in v5.0.11. + + +5.0.11 - 2024-01-29 +------------------- + +- Improved the Chinese translation (@zengqiu). + + +5.0.10 - 2023-12-30 +------------------- + +- Fix N+1 queries while rendering the ``recover_list.html`` template (@armonge). + + +5.0.9 - 2023-12-20 +------------------ + +- Broken release. + + +5.0.8 - 2023-11-08 +------------------ + +- Fix ``get_deleted`` (@siddarta-weis, @etianen). + + +5.0.7 - 2023-11-07 +------------------ + +- Speed up ``get_deleted`` (@caullla). + + +5.0.6 - 2023-09-29 +------------------ + +- Fix handling case of missing object in admin revert (@julianklotz) + + +5.0.5 - 2023-09-19 +------------------ + +- Handling case of missing object in admin revert (@etianen, @PavelPancocha) +- CI improvements (@etianen, @browniebroke) + + 5.0.4 - 2022-11-12 ------------------ @@ -96,13 +145,14 @@ - Documentation fixes (@chicheng). -3.0.5 - 2019-02-12 +3.0.5 - 2019-12-02 ------------------ - Improved performance of `get_deleted` for large datasets (@jeremy-engel). - Django 3.0 compatibility (@claudep). - Drops Django < 1.11 compatibility (@claudep). -- Fixed errors in manageement commands when `django.contrib.admin` is not in `INSTALLED_APPS` (@irtimir). +- Drops Python 2.7 compatibility (@claudep). +- Fixed errors in management commands when `django.contrib.admin` is not in `INSTALLED_APPS` (@irtimir). 3.0.4 - 2019-05-22 @@ -147,7 +197,7 @@ ------------------ - **Breaking:** ``Revision.comment`` now contains the raw JSON change message generated by django admin, rather than - a string. Accesing ``Revision.comment`` directly is no longer recommended. Instead, use ``Revision.get_comment()``. + a string. Accessing ``Revision.comment`` directly is no longer recommended. Instead, use ``Revision.get_comment()``. (@RamezIssac). - **BREAKING:** django-reversion now uses ``_base_manager`` to calculate deleted models, not ``_default_manager``. This change will only affect models that perform default filtering in their ``_default_manager`` (@ivissani). @@ -504,7 +554,7 @@ .. code:: python - # New-style import for accesssing admin class. + # New-style import for accessing admin class. from reversion.admin import VersionAdmin # Use the admin class directly. @@ -531,7 +581,7 @@ .. code:: python - # New-style import for accesssing the low-level API. + # New-style import for accessing the low-level API. from reversion import revisions as reversion # Use low-level API methods from the revisions namespace. @@ -556,7 +606,7 @@ .. code:: python - # New-style import for accesssing the reversion signals. + # New-style import for accessing the reversion signals. from reversion.signals import pre_revision_commit, post_revision_commit # Use reversion signals directly. @@ -685,7 +735,7 @@ ---------------- * Django 1.5 compatibility. -* Experimantal Python 3.3 compatibility! +* Experimental Python 3.3 compatibility! 1.6.6 - 12/02/2013 @@ -725,7 +775,7 @@ ------------------ * Swedish translation. -* Fixing formating for PyPi readme and license. +* Fixing formatting for PyPi readme and license. * Minor features and bugfixes. @@ -789,8 +839,8 @@ * Added Polish translation. * Added French translation. * Improved resilience of unit tests. -* Improved scaleability of Version.object.get_deleted() method. -* Improved scaleability of createinitialrevisions command. +* Improved scalability of Version.object.get_deleted() method. +* Improved scalability of createinitialrevisions command. * Removed post_syncdb hook. * Added new createinitialrevisions management command. * Fixed DoesNotExistError with OneToOneFields and follow. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/PKG-INFO new/django-reversion-5.0.12/PKG-INFO --- old/django-reversion-5.0.4/PKG-INFO 2022-11-12 15:45:34.012175800 +0100 +++ new/django-reversion-5.0.12/PKG-INFO 2024-01-30 21:05:51.790807700 +0100 @@ -1,8 +1,8 @@ Metadata-Version: 2.1 Name: django-reversion -Version: 5.0.4 +Version: 5.0.12 Summary: An extension to the Django web framework that provides version control for model instances. -Home-page: http://github.com/etianen/django-reversion +Home-page: https://github.com/etianen/django-reversion Author: Dave Hall Author-email: d...@etianen.com License: BSD @@ -16,9 +16,11 @@ Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 +Classifier: Programming Language :: Python :: 3.11 Classifier: Framework :: Django Requires-Python: >=3.7 License-File: LICENSE +Requires-Dist: django>=3.2 ================ django-reversion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/django_reversion.egg-info/PKG-INFO new/django-reversion-5.0.12/django_reversion.egg-info/PKG-INFO --- old/django-reversion-5.0.4/django_reversion.egg-info/PKG-INFO 2022-11-12 15:45:33.000000000 +0100 +++ new/django-reversion-5.0.12/django_reversion.egg-info/PKG-INFO 2024-01-30 21:05:51.000000000 +0100 @@ -1,8 +1,8 @@ Metadata-Version: 2.1 Name: django-reversion -Version: 5.0.4 +Version: 5.0.12 Summary: An extension to the Django web framework that provides version control for model instances. -Home-page: http://github.com/etianen/django-reversion +Home-page: https://github.com/etianen/django-reversion Author: Dave Hall Author-email: d...@etianen.com License: BSD @@ -16,9 +16,11 @@ Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 +Classifier: Programming Language :: Python :: 3.11 Classifier: Framework :: Django Requires-Python: >=3.7 License-File: LICENSE +Requires-Dist: django>=3.2 ================ django-reversion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/django_reversion.egg-info/SOURCES.txt new/django-reversion-5.0.12/django_reversion.egg-info/SOURCES.txt --- old/django-reversion-5.0.4/django_reversion.egg-info/SOURCES.txt 2022-11-12 15:45:33.000000000 +0100 +++ new/django-reversion-5.0.12/django_reversion.egg-info/SOURCES.txt 2024-01-30 21:05:51.000000000 +0100 @@ -77,8 +77,6 @@ reversion/locale/sv/LC_MESSAGES/django.po reversion/locale/uk/LC_MESSAGES/django.mo reversion/locale/uk/LC_MESSAGES/django.po -reversion/locale/zh_CN/LC_MESSAGES/django.mo -reversion/locale/zh_CN/LC_MESSAGES/django.po reversion/locale/zh_Hans/LC_MESSAGES/django.mo reversion/locale/zh_Hans/LC_MESSAGES/django.po reversion/management/__init__.py @@ -100,6 +98,7 @@ tests/test_app/urls.py tests/test_app/views.py tests/test_app/migrations/0001_initial.py +tests/test_app/migrations/0002_alter_testmodel_related_and_more.py tests/test_app/migrations/__init__.py tests/test_app/tests/__init__.py tests/test_app/tests/base.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/docs/admin.rst new/django-reversion-5.0.12/docs/admin.rst --- old/django-reversion-5.0.4/docs/admin.rst 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/docs/admin.rst 2024-01-30 21:05:40.000000000 +0100 @@ -5,6 +5,16 @@ django-reversion can be used to add rollback and recovery to your admin site. +.. Important:: + Using the admin integration's preview feature will restore your model inside a temporary transaction, then roll + back the transaction once the preview is rendered. + + The ``Model.save()`` method, along with any ``pre_save`` and ``post_save`` signals, will be run as part of the preview transaction. Any non-transactional side-effects of these functions (e.g. filesystem, cache) will **not be rolled back** at the end of the preview. + + The ``raw=True`` flag will be set in ``pre_save`` and ``post_save`` signals, allowing you to distinguish preview transactions from regular database transactions and avoid non-transactional side-effects. + + Alternatively, use `transaction.on_commit() <https://docs.djangoproject.com/en/4.2/topics/db/transactions/#django.db.transaction.on_commit>`_ to register side-effects to be carried out only on committed transactions. + .. Warning:: The admin integration requires that your database engine supports transactions. This is the case for PostgreSQL, SQLite and MySQL InnoDB. If you are using MySQL MyISAM, upgrade your database tables to InnoDB! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/__init__.py new/django-reversion-5.0.12/reversion/__init__.py --- old/django-reversion-5.0.4/reversion/__init__.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/__init__.py 2024-01-30 21:05:40.000000000 +0100 @@ -36,4 +36,4 @@ get_registered_models, ) -__version__ = VERSION = (5, 0, 4) +__version__ = VERSION = (5, 0, 12) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/admin.py new/django-reversion-5.0.12/reversion/admin.py --- old/django-reversion-5.0.4/reversion/admin.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/admin.py 2024-01-30 21:05:40.000000000 +0100 @@ -178,10 +178,14 @@ set_comment(_("Reverted to previous version, saved on %(datetime)s") % { "datetime": localize(template_localtime(version.revision.date_created)), }) - else: + elif response.status_code == 200: response.template_name = template_name # Set the template name to the correct template. response.render() # Eagerly render the response, so it's using the latest version. raise _RollBackRevisionView(response) # Raise exception to undo the transaction and revision. + else: + raise RevertError(_("Could not load %(object_repr)s version - not found") % { + "object_repr": version.object_repr, + }) except (RevertError, models.ProtectedError) as ex: opts = self.model._meta messages.error(request, force_str(ex)) @@ -241,7 +245,9 @@ raise PermissionDenied model = self.model opts = model._meta - deleted = self._reversion_order_version_queryset(Version.objects.get_deleted(self.model)) + deleted = self._reversion_order_version_queryset( + Version.objects.get_deleted(self.model).select_related("revision") + ) # Set the app name. request.current_app = self.admin_site.name # Get the rest of the context. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/apps.py new/django-reversion-5.0.12/reversion/apps.py --- old/django-reversion-5.0.4/reversion/apps.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/apps.py 2024-01-30 21:05:40.000000000 +0100 @@ -1,6 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class ReversionConfig(AppConfig): name = 'reversion' + verbose_name = _('Reversion') default_auto_field = 'django.db.models.AutoField' Binary files old/django-reversion-5.0.4/reversion/locale/zh_CN/LC_MESSAGES/django.mo and new/django-reversion-5.0.12/reversion/locale/zh_CN/LC_MESSAGES/django.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/locale/zh_CN/LC_MESSAGES/django.po new/django-reversion-5.0.12/reversion/locale/zh_CN/LC_MESSAGES/django.po --- old/django-reversion-5.0.4/reversion/locale/zh_CN/LC_MESSAGES/django.po 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/locale/zh_CN/LC_MESSAGES/django.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-12 14:21+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: admin.py:160 -msgid "Initial version." -msgstr "åå§çæ¬" - -#: admin.py:194 templates/reversion/change_list.html:7 -#: templates/reversion/recover_form.html:11 -#: templates/reversion/recover_list.html:11 -#, python-format -msgid "Recover deleted %(name)s" -msgstr "æ¢å¤å·²å é¤ç %(name)s" - -#: admin.py:311 -#, python-format -msgid "Reverted to previous version, saved on %(datetime)s" -msgstr "æ¢å¤å° %(datetime)s ççæ¬" - -#: admin.py:313 -#, python-format -msgid "" -"The %(model)s \"%(name)s\" was reverted successfully. You may edit it again " -"below." -msgstr "%(model)s \"%(name)s\" å·²æåæ¢å¤ï¼ä½ å¯ä»¥å¨ä¸é¢å¨æ¤ç¼è¾å®ã" - -#: admin.py:398 -#, python-format -msgid "Recover %(name)s" -msgstr "æ¢å¤ %(name)s" - -#: admin.py:412 -#, python-format -msgid "Revert %(name)s" -msgstr "æ¢å¤ %(name)s" - -#: models.py:55 -msgid "date created" -msgstr "åå»ºæ¥æ" - -#: models.py:62 -msgid "user" -msgstr "ç¨æ·" - -#: models.py:66 -msgid "comment" -msgstr "è¯è®º" - -#: templates/reversion/object_history.html:8 -msgid "" -"Choose a date from the list below to revert to a previous version of this " -"object." -msgstr "åå»ä¸æ¹çæ¥æä»¥æ¢å¤å½å对象å°ä¹åççæ¬ã" - -#: templates/reversion/object_history.html:15 -#: templates/reversion/recover_list.html:24 -msgid "Date/time" -msgstr "æ¶é´" - -#: templates/reversion/object_history.html:16 -msgid "User" -msgstr "ç¨æ·" - -#: templates/reversion/object_history.html:17 -msgid "Comment" -msgstr "è¯è®º" - -#: templates/reversion/object_history.html:38 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "æ¤å¯¹è±¡ä¸åå¨ä»»ä½åæ´åå²ï¼å®å¯è½ä¸æ¯éè¿ç®¡çç«ç¹æ·»å çã" - -#: templates/reversion/recover_form.html:8 -#: templates/reversion/recover_list.html:8 -#: templates/reversion/revision_form.html:8 -msgid "Home" -msgstr "é¦é¡µ" - -#: templates/reversion/recover_form.html:18 -msgid "Press the save button below to recover this version of the object." -msgstr "åå»ä¿åæé®ä»¥æ¢å¤ä¸ºæ¤çæ¬ã" - -#: templates/reversion/recover_list.html:18 -msgid "" -"Choose a date from the list below to recover a deleted version of an object." -msgstr "åå»ä¸æ¹çæ¥æä»¥æ¢å¤ä¸ä¸ªå·²å é¤ç对象ã" - -#: templates/reversion/recover_list.html:38 -msgid "There are no deleted objects to recover." -msgstr "没æå¯ä¾æ¢å¤çå·²å é¤å¯¹è±¡ã" - -#: templates/reversion/revision_form.html:12 -msgid "History" -msgstr "åå²" - -#: templates/reversion/revision_form.html:13 -#, python-format -msgid "Revert %(verbose_name)s" -msgstr "æ¢å¤ %(verbose_name)s" - -#: templates/reversion/revision_form.html:26 -msgid "Press the save button below to revert to this version of the object." -msgstr "åå»ä¿åæé®å°æ¤å¯¹è±¡æ¢å¤å°æ¤çæ¬ã" Binary files old/django-reversion-5.0.4/reversion/locale/zh_Hans/LC_MESSAGES/django.mo and new/django-reversion-5.0.12/reversion/locale/zh_Hans/LC_MESSAGES/django.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/locale/zh_Hans/LC_MESSAGES/django.po new/django-reversion-5.0.12/reversion/locale/zh_Hans/LC_MESSAGES/django.po --- old/django-reversion-5.0.4/reversion/locale/zh_Hans/LC_MESSAGES/django.po 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/locale/zh_Hans/LC_MESSAGES/django.po 2024-01-30 21:05:40.000000000 +0100 @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-12 14:21+0800\n" +"POT-Creation-Date: 2024-01-25 16:26+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -18,104 +18,138 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: admin.py:160 +#: .\admin.py:70 msgid "Initial version." msgstr "åå§çæ¬" -#: admin.py:194 templates/reversion/change_list.html:7 -#: templates/reversion/recover_form.html:11 -#: templates/reversion/recover_list.html:11 -#, python-format -msgid "Recover deleted %(name)s" -msgstr "æ¢å¤å·²å é¤ç %(name)s" - -#: admin.py:311 +#: .\admin.py:178 #, python-format msgid "Reverted to previous version, saved on %(datetime)s" msgstr "æ¢å¤å° %(datetime)s ççæ¬" -#: admin.py:313 +#: .\admin.py:186 #, python-format -msgid "" -"The %(model)s \"%(name)s\" was reverted successfully. You may edit it again " -"below." -msgstr "%(model)s \"%(name)s\" å·²æåæ¢å¤ï¼ä½ å¯ä»¥å¨ä¸é¢å¨æ¤ç¼è¾å®ã" +msgid "Could not load %(object_repr)s version - not found" +msgstr "æ æ³è½½å ¥ %(object_repr)s çæ¬ - æªæ¾å°" -#: admin.py:398 +#: .\admin.py:206 #, python-format msgid "Recover %(name)s" msgstr "æ¢å¤ %(name)s" -#: admin.py:412 +#: .\admin.py:222 #, python-format msgid "Revert %(name)s" msgstr "æ¢å¤ %(name)s" -#: models.py:55 +#: .\admin.py:259 .\templates\reversion\change_list.html:7 +#: .\templates\reversion\recover_form.html:10 +#: .\templates\reversion\recover_list.html:10 +#, python-format +msgid "Recover deleted %(name)s" +msgstr "æ¢å¤å·²å é¤ç %(name)s" + +#: .\apps.py:7 +msgid "Reversion" +msgstr "çæ¬è®°å½" + +#: .\models.py:39 +#, python-format +msgid "Could not save %(object_repr)s version - missing dependency." +msgstr "æ æ³ä¿å %(object_repr)s çæ¬ - 缺å°ä¾èµ" + +#: .\models.py:52 msgid "date created" msgstr "åå»ºæ¥æ" -#: models.py:62 +#: .\models.py:61 msgid "user" msgstr "ç¨æ·" -#: models.py:66 +#: .\models.py:67 msgid "comment" msgstr "è¯è®º" -#: templates/reversion/object_history.html:8 +#: .\models.py:116 +msgid "revision" +msgstr "ä¿®æ¹" + +#: .\models.py:117 +msgid "revisions" +msgstr "ä¿®æ¹" + +#: .\models.py:275 +#, python-format +msgid "Could not load %(object_repr)s version - incompatible version data." +msgstr "æ æ³è½½å ¥ %(object_repr)s çæ¬ - ä¸å ¼å®¹ççæ¬æ°æ®ã" + +#: .\models.py:279 +#, python-format +msgid "Could not load %(object_repr)s version - unknown serializer %(format)s." +msgstr "æ æ³è½½å ¥ %(object_repr)s çæ¬ - æªç¥çåºåå %(format)sã" + +#: .\models.py:335 +#, fuzzy +msgid "version" +msgstr "çæ¬" + +#: .\models.py:336 +msgid "versions" +msgstr "çæ¬" + +#: .\templates\reversion\object_history.html:8 msgid "" "Choose a date from the list below to revert to a previous version of this " "object." msgstr "åå»ä¸æ¹çæ¥æä»¥æ¢å¤å½å对象å°ä¹åççæ¬ã" -#: templates/reversion/object_history.html:15 -#: templates/reversion/recover_list.html:24 +#: .\templates\reversion\object_history.html:15 +#: .\templates\reversion\recover_list.html:23 msgid "Date/time" msgstr "æ¶é´" -#: templates/reversion/object_history.html:16 +#: .\templates\reversion\object_history.html:16 msgid "User" msgstr "ç¨æ·" -#: templates/reversion/object_history.html:17 -msgid "Comment" -msgstr "è¯è®º" +#: .\templates\reversion\object_history.html:17 +msgid "Action" +msgstr "æä½" -#: templates/reversion/object_history.html:38 +#: .\templates\reversion\object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "æ¤å¯¹è±¡ä¸åå¨ä»»ä½åæ´åå²ï¼å®å¯è½ä¸æ¯éè¿ç®¡çç«ç¹æ·»å çã" -#: templates/reversion/recover_form.html:8 -#: templates/reversion/recover_list.html:8 -#: templates/reversion/revision_form.html:8 +#: .\templates\reversion\recover_form.html:7 +#: .\templates\reversion\recover_list.html:7 +#: .\templates\reversion\revision_form.html:7 msgid "Home" msgstr "é¦é¡µ" -#: templates/reversion/recover_form.html:18 +#: .\templates\reversion\recover_form.html:20 msgid "Press the save button below to recover this version of the object." msgstr "åå»ä¿åæé®ä»¥æ¢å¤ä¸ºæ¤çæ¬ã" -#: templates/reversion/recover_list.html:18 +#: .\templates\reversion\recover_list.html:17 msgid "" "Choose a date from the list below to recover a deleted version of an object." msgstr "åå»ä¸æ¹çæ¥æä»¥æ¢å¤ä¸ä¸ªå·²å é¤ç对象ã" -#: templates/reversion/recover_list.html:38 +#: .\templates\reversion\recover_list.html:37 msgid "There are no deleted objects to recover." msgstr "没æå¯ä¾æ¢å¤çå·²å é¤å¯¹è±¡ã" -#: templates/reversion/revision_form.html:12 +#: .\templates\reversion\revision_form.html:11 msgid "History" msgstr "åå²" -#: templates/reversion/revision_form.html:13 +#: .\templates\reversion\revision_form.html:12 #, python-format msgid "Revert %(verbose_name)s" msgstr "æ¢å¤ %(verbose_name)s" -#: templates/reversion/revision_form.html:26 +#: .\templates\reversion\revision_form.html:21 msgid "Press the save button below to revert to this version of the object." msgstr "åå»ä¿åæé®å°æ¤å¯¹è±¡æ¢å¤å°æ¤çæ¬ã" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/migrations/0001_squashed_0004_auto_20160611_1202.py new/django-reversion-5.0.12/reversion/migrations/0001_squashed_0004_auto_20160611_1202.py --- old/django-reversion-5.0.4/reversion/migrations/0001_squashed_0004_auto_20160611_1202.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/migrations/0001_squashed_0004_auto_20160611_1202.py 2024-01-30 21:05:40.000000000 +0100 @@ -23,7 +23,9 @@ ('user', models.ForeignKey(blank=True, help_text='The user who created this revision.', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user')), ], options={ - "ordering": ("-pk",) + "ordering": ("-pk",), + 'verbose_name': 'revision', + 'verbose_name_plural': 'revisions', }, ), migrations.CreateModel( @@ -39,7 +41,9 @@ ('db', models.CharField(help_text='The database the model under version control is stored in.', max_length=191)), ], options={ - "ordering": ("-pk",) + "ordering": ("-pk",), + 'verbose_name': 'version', + 'verbose_name_plural': 'versions', }, ), migrations.AlterUniqueTogether( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/reversion/models.py new/django-reversion-5.0.12/reversion/models.py --- old/django-reversion-5.0.4/reversion/models.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/reversion/models.py 2024-01-30 21:05:40.000000000 +0100 @@ -113,6 +113,8 @@ return ", ".join(force_str(version) for version in self.version_set.all()) class Meta: + verbose_name = _('revision') + verbose_name_plural = _('revisions') app_label = "reversion" ordering = ("-pk",) @@ -330,6 +332,8 @@ return self.object_repr class Meta: + verbose_name = _('version') + verbose_name_plural = _('versions') app_label = 'reversion' unique_together = ( ("db", "content_type", "object_id", "revision"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/setup.py new/django-reversion-5.0.12/setup.py --- old/django-reversion-5.0.4/setup.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/setup.py 2024-01-30 21:05:40.000000000 +0100 @@ -28,7 +28,7 @@ long_description=read('README.rst'), author="Dave Hall", author_email="d...@etianen.com", - url="http://github.com/etianen/django-reversion", + url="https://github.com/etianen/django-reversion", zip_safe=False, packages=find_packages(), package_data={ @@ -49,6 +49,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', "Framework :: Django", ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/tests/test_app/migrations/0002_alter_testmodel_related_and_more.py new/django-reversion-5.0.12/tests/test_app/migrations/0002_alter_testmodel_related_and_more.py --- old/django-reversion-5.0.4/tests/test_app/migrations/0002_alter_testmodel_related_and_more.py 1970-01-01 01:00:00.000000000 +0100 +++ new/django-reversion-5.0.12/tests/test_app/migrations/0002_alter_testmodel_related_and_more.py 2024-01-30 21:05:40.000000000 +0100 @@ -0,0 +1,23 @@ +# Generated by Django 5.0.1 on 2024-01-30 19:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('test_app', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='testmodel', + name='related', + field=models.ManyToManyField(blank=True, related_name='+', to='test_app.testmodelrelated'), + ), + migrations.AlterField( + model_name='testmodel', + name='related_through', + field=models.ManyToManyField(blank=True, related_name='+', through='test_app.TestModelThrough', to='test_app.testmodelrelated'), + ), + ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-reversion-5.0.4/tests/test_project/settings.py new/django-reversion-5.0.12/tests/test_project/settings.py --- old/django-reversion-5.0.4/tests/test_project/settings.py 2022-11-12 15:45:23.000000000 +0100 +++ new/django-reversion-5.0.12/tests/test_project/settings.py 2024-01-30 21:05:40.000000000 +0100 @@ -97,6 +97,7 @@ }, } +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Password validation # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators ++++++ only-sqlite-test-db.patch ++++++ --- /var/tmp/diff_new_pack.qAh9IS/_old 2024-02-22 20:59:34.121472733 +0100 +++ /var/tmp/diff_new_pack.qAh9IS/_new 2024-02-22 20:59:34.125472879 +0100 @@ -4,10 +4,10 @@ Remove mysql and postgres databases -diff --git a/tests/test_project/settings.py b/tests/test_project/settings.py -index dc346d9..f07e648 100644 ---- a/tests/test_project/settings.py -+++ b/tests/test_project/settings.py +Index: django-reversion-5.0.12/tests/test_project/settings.py +=================================================================== +--- django-reversion-5.0.12.orig/tests/test_project/settings.py ++++ django-reversion-5.0.12/tests/test_project/settings.py @@ -81,20 +81,6 @@ DATABASES = { "ENGINE": "django.db.backends.sqlite3", "NAME": os.path.join(BASE_DIR, "db.sqlite3"), @@ -28,5 +28,5 @@ - }, } - + DEFAULT_AUTO_FIELD = "django.db.models.AutoField"