Hello community,
here is the log from the commit of package python-django-grappelli for
openSUSE:Factory checked in at 2020-06-10 00:51:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-grappelli (Old)
and /work/SRC/openSUSE:Factory/.python-django-grappelli.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-grappelli"
Wed Jun 10 00:51:28 2020 rev:19 rq:812886 version:2.14.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-grappelli/python-django-grappelli.changes
2020-02-20 14:58:59.398713021 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-grappelli.new.3606/python-django-grappelli.changes
2020-06-10 00:51:36.243445374 +0200
@@ -1,0 +2,11 @@
+Tue Jun 9 11:11:56 UTC 2020 - Ondřej Súkup <[email protected]>
+
+- Update to 2.14.2
+ * Fixed: Django version (3.0) with docs and quickstart.
+ * Fixed: Dashboard with metaclass.
+ * Fixed: Missing variable in RelatedObjectLookups.
+ * Fixed: Sortables with tuples when using StackedInlines.
+ * Improved: Removed six dependency.
+ * Improved: Changed bodyclass in order to allow adding more attributes.
+
+-------------------------------------------------------------------
Old:
----
2.14.1.tar.gz
New:
----
2.14.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-grappelli.spec ++++++
--- /var/tmp/diff_new_pack.1TgES8/_old 2020-06-10 00:51:37.283448095 +0200
+++ /var/tmp/diff_new_pack.1TgES8/_new 2020-06-10 00:51:37.283448095 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-django-grappelli
-Version: 2.14.1
+Version: 2.14.2
Release: 0
Summary: A skin for the Django Admin-Interface
License: BSD-2-Clause AND LGPL-2.1-or-later
++++++ 2.14.1.tar.gz -> 2.14.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/.gitignore
new/django-grappelli-2.14.2/.gitignore
--- old/django-grappelli-2.14.1/.gitignore 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/.gitignore 2020-05-14 15:15:52.000000000
+0200
@@ -13,3 +13,4 @@
.pydevproject
node_modules/*
.tox/*
+.idea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/.travis.yml
new/django-grappelli-2.14.2/.travis.yml
--- old/django-grappelli-2.14.1/.travis.yml 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/.travis.yml 2020-05-14 15:15:52.000000000
+0200
@@ -1,13 +1,18 @@
dist: xenial
language: python
-python: 3.6
+matrix:
+ include:
+ - python: 3.6
+ env: TOXENV=py36
+ - python: 3.7
+ env: TOXENV=py37
+ - python: 3.8
+ env: TOXENV=py38
install:
- pip install tox
- pip install coverage
script:
- tox
-env:
- - TOXENV=py36
branches:
only:
- stable/2.14.x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/README.rst
new/django-grappelli-2.14.2/README.rst
--- old/django-grappelli-2.14.1/README.rst 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/README.rst 2020-05-14 15:15:52.000000000
+0200
@@ -36,13 +36,13 @@
**Grappelli is always developed against the latest stable Django release and
is NOT tested with Django's master branch.**
-* Grappelli 2.14.1 (February 10th, 2020): Compatible with Django 3.0
-* Grappelli 2.13.4 (February 10th, 2020): Compatible with Django 2.2
+* Grappelli 2.14.2 (May 14th, 2020): Compatible with Django 3.0
+* Grappelli 2.13.4 (February 10th, 2020): Compatible with Django 2.2 (LTS)
* Grappelli 2.10.4 (November 1st, 2018): Compatible with Django 1.11 (LTS)
Current development branches:
-* Grappelli 2.14.2 (Development version for Django 2.2, see branch
Stable/2.14.x)
+* Grappelli 2.14.3 (Development version for Django 3.0, see branch
Stable/2.14.x)
* Grappelli 2.13.5 (Development version for Django 2.2, see branch
Stable/2.13.x)
* Grappelli 2.10.5 (Development version for Django 1.11, see branch
Stable/2.10.x)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/docs/changelog.rst
new/django-grappelli-2.14.2/docs/changelog.rst
--- old/django-grappelli-2.14.1/docs/changelog.rst 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/docs/changelog.rst 2020-05-14
15:15:52.000000000 +0200
@@ -8,9 +8,20 @@
Changelog
=========
-2.14.2 (not yet released)
+2.14.3 (not yet released)
-------------------------
+2.14.2 (May 14th, 2020)
+-----------------------
+
+* Fixed: Django version (3.0) with docs and quickstart.
+* Fixed: Dashboard with metaclass.
+* Fixed: Missing variable in RelatedObjectLookups.
+* Fixed: Sortables with tuples when using StackedInlines.
+* Improved: Removed six dependency.
+* Improved: Changed bodyclass in order to allow adding more attributes.
+* Improved: Adding Python 3.7 /3.8 to CI tests.
+
2.14.1 (February 10th, 2020)
----------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/docs/conf.py
new/django-grappelli-2.14.2/docs/conf.py
--- old/django-grappelli-2.14.1/docs/conf.py 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/docs/conf.py 2020-05-14 15:15:52.000000000
+0200
@@ -52,9 +52,9 @@
# built documents.
#
# The short X.Y version.
-version = '2.14.1'
+version = '2.14.2'
# The full version, including alpha/beta/rc tags.
-release = '2.14.1'
+release = '2.14.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/docs/dashboard_api.rst
new/django-grappelli-2.14.2/docs/dashboard_api.rst
--- old/django-grappelli-2.14.1/docs/dashboard_api.rst 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/docs/dashboard_api.rst 2020-05-14
15:15:52.000000000 +0200
@@ -53,7 +53,7 @@
# append a recent actions module
self.children.append(modules.RecentActions(
- title=_('Recent Actions'),
+ title=_('Recent actions'),
column=2,
collapsible=False,
limit=5,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/docs/index.rst
new/django-grappelli-2.14.2/docs/index.rst
--- old/django-grappelli-2.14.1/docs/index.rst 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/docs/index.rst 2020-05-14 15:15:52.000000000
+0200
@@ -4,7 +4,7 @@
contain the root `toctree` directive.
.. |grappelli| replace:: Grappelli
.. |filebrowser| replace:: FileBrowser
-.. |grappelliversion| replace:: 2.14.1
+.. |grappelliversion| replace:: 2.14.2
.. _index:
@@ -16,7 +16,7 @@
This documentation covers version |version| of |grappelli|. |grappelli| is a
grid-based alternative/extension to the `Django
<http://www.djangoproject.com>`_ administration interface.
.. note::
- |grappelli| |version| requires Django 2.2. More on :ref:`versions`.
+ |grappelli| |version| requires Django 3.0. More on :ref:`versions`.
Installation & Setup
--------------------
@@ -76,13 +76,13 @@
**Grappelli is always developed against the latest stable Django release and
is NOT tested with Django's master branch.**
-* Grappelli 2.14.1 (February 10th, 2020): Compatible with Django 3.0
-* Grappelli 2.13.4 (February 10th, 2020): Compatible with Django 2.2
+* Grappelli 2.14.2 (May 14th, 2020): Compatible with Django 3.0
+* Grappelli 2.13.4 (February 10th, 2020): Compatible with Django 2.2 (LTS)
* Grappelli 2.10.4 (November 1st, 2018): Compatible with Django 1.11 (LTS)
Current development branches:
-* Grappelli 2.14.2 (Development version for Django 2.2, see branch
Stable/2.14.x)
+* Grappelli 2.14.3 (Development version for Django 3.0, see branch
Stable/2.14.x)
* Grappelli 2.13.5 (Development version for Django 2.2, see branch
Stable/2.13.x)
* Grappelli 2.10.5 (Development version for Django 1.11, see branch
Stable/2.10.x)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/docs/quickstart.rst
new/django-grappelli-2.14.2/docs/quickstart.rst
--- old/django-grappelli-2.14.1/docs/quickstart.rst 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/docs/quickstart.rst 2020-05-14
15:15:52.000000000 +0200
@@ -1,13 +1,13 @@
.. |grappelli| replace:: Grappelli
.. |filebrowser| replace:: FileBrowser
-.. |grappelliversion| replace:: 2.14.1
+.. |grappelliversion| replace:: 2.14.2
.. _quickstart:
Quick start guide
=================
-For using |grappelli| |grappelliversion|, `Django 2.2
<http://www.djangoproject.com>`_ needs to be installed and an `Admin Site
<http://docs.djangoproject.com/en/2.2/ref/contrib/admin/>`_ has to be activated.
+For using |grappelli| |grappelliversion|, `Django 3.0
<http://www.djangoproject.com>`_ needs to be installed and an `Admin Site
<http://docs.djangoproject.com/en/2.2/ref/contrib/admin/>`_ has to be activated.
Installation
------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/grappelli/__init__.py
new/django-grappelli-2.14.2/grappelli/__init__.py
--- old/django-grappelli-2.14.1/grappelli/__init__.py 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/__init__.py 2020-05-14
15:15:52.000000000 +0200
@@ -1,2 +1,2 @@
-VERSION = '2.14.1'
+VERSION = '2.14.2'
default_app_config = 'grappelli.apps.GrappelliConfig'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/dashboard/dashboards.py
new/django-grappelli-2.14.2/grappelli/dashboard/dashboards.py
--- old/django-grappelli-2.14.1/grappelli/dashboard/dashboards.py
2020-02-10 15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/dashboard/dashboards.py
2020-05-14 15:15:52.000000000 +0200
@@ -11,10 +11,8 @@
from grappelli.dashboard import modules
from grappelli.dashboard.utils import get_admin_site_name
-import six
-
-class Dashboard(six.with_metaclass(forms.MediaDefiningClass)):
+class Dashboard(metaclass=forms.MediaDefiningClass):
"""
Base class for dashboards.
The Dashboard class is a simple python list that has three additional
@@ -80,7 +78,7 @@
# append a recent actions module
self.children.append(modules.RecentActions(
- title=_('Recent Actions'),
+ title=_('Recent actions'),
limit=5
))
@@ -153,7 +151,7 @@
))
# append a recent actions module
- self.children.append(modules.RecentActions(_('Recent Actions'), 5))
+ self.children.append(modules.RecentActions(_('Recent actions'), 5))
# append a feed module
self.children.append(modules.Feed(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/dashboard/modules.py
new/django-grappelli-2.14.2/grappelli/dashboard/modules.py
--- old/django-grappelli-2.14.1/grappelli/dashboard/modules.py 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/dashboard/modules.py 2020-05-14
15:15:52.000000000 +0200
@@ -292,7 +292,7 @@
Module that lists the recent actions for the current user.
"""
- title = _('Recent Actions')
+ title = _('Recent actions')
template = 'grappelli/dashboard/modules/recent_actions.html'
limit = 10
include_list = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/dashboard/templates/grappelli/dashboard/dashboard.txt
new/django-grappelli-2.14.2/grappelli/dashboard/templates/grappelli/dashboard/dashboard.txt
---
old/django-grappelli-2.14.1/grappelli/dashboard/templates/grappelli/dashboard/dashboard.txt
2020-02-10 15:28:17.000000000 +0100
+++
new/django-grappelli-2.14.2/grappelli/dashboard/templates/grappelli/dashboard/dashboard.txt
2020-05-14 15:15:52.000000000 +0200
@@ -105,7 +105,7 @@
# append a recent actions module
self.children.append(modules.RecentActions(
- _('Recent Actions'),
+ _('Recent actions'),
limit=5,
collapsible=False,
column=3,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/static/admin/js/admin/RelatedObjectLookups.js
new/django-grappelli-2.14.2/grappelli/static/admin/js/admin/RelatedObjectLookups.js
---
old/django-grappelli-2.14.1/grappelli/static/admin/js/admin/RelatedObjectLookups.js
2020-02-10 15:28:17.000000000 +0100
+++
new/django-grappelli-2.14.2/grappelli/static/admin/js/admin/RelatedObjectLookups.js
2020-05-14 15:15:52.000000000 +0200
@@ -106,7 +106,7 @@
function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
var id = windowname_to_id(win.name).replace(/^edit_/, '');
- var elem = document.getElementById(name);
+ var elem = document.getElementById(id);
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id,
id]);
var selects = $(selectsSelector);
selects.find('option').each(function() {
@@ -128,6 +128,7 @@
function dismissDeleteRelatedObjectPopup(win, objId) {
var id = windowname_to_id(win.name).replace(/^delete_/, '');
+ var elem = document.getElementById(id);
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id,
id]);
var selects = $(selectsSelector);
selects.find('option').each(function() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/templates/admin/base.html
new/django-grappelli-2.14.2/grappelli/templates/admin/base.html
--- old/django-grappelli-2.14.1/grappelli/templates/admin/base.html
2020-02-10 15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/templates/admin/base.html
2020-05-14 15:15:52.000000000 +0200
@@ -65,7 +65,7 @@
<!-- EXTRAHEAD -->
{% block extrahead %}{% endblock %}
</head>
-<body class="{% if is_popup %}grp-popup {% endif %}{% block bodyclass %}{%
endblock %}{% if LANGUAGE_BIDI %} rtl{% endif %}">
+<body class="{% if is_popup %}grp-popup {% endif %}{% if LANGUAGE_BIDI %}rtl
{% endif %}{% block bodyclass %}{% endblock %}">
<div id="container" class="grp-container">
{% block header %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/templates/admin/edit_inline/stacked.html
new/django-grappelli-2.14.2/grappelli/templates/admin/edit_inline/stacked.html
---
old/django-grappelli-2.14.1/grappelli/templates/admin/edit_inline/stacked.html
2020-02-10 15:28:17.000000000 +0100
+++
new/django-grappelli-2.14.2/grappelli/templates/admin/edit_inline/stacked.html
2020-05-14 15:15:52.000000000 +0200
@@ -234,21 +234,24 @@
.find("div.grp-row.{{
inline_admin_formset.opts.sortable_field_name }} :input")
.each(function(i, item) {
$(item).on('change', function(event) {
- var desired_index = $(event.target).val() * 1;
- if(!isNaN(desired_index) && desired_index >= 0) {
- var $row =
$(event.target).parents('div.grp-dynamic-form');
- var $table = $row.parents('div.grp-items.ui-sortable');
- $row.detach();
- var $row_desired =
$table.children('div.grp-dynamic-form').get(desired_index);
- if($row_desired) {
- $row.insertBefore($row_desired);
- $row.find('h3,div.grp-row').effect('highlight',
{color:"#ffffcc"}, 2000);
- } else {
- // FIXME: this appends the new row to the very end
of the table.
- // instead, it should be added after the last row
with values.
- $table.append($row);
- $row.find('h3,div.grp-row').effect('highlight',
{color:"#ffffcc"}, 2000);
- }
+ var name = $(item).attr("name").split("-").pop();
+ if (name === "{{
inline_admin_formset.opts.sortable_field_name }}") {
+ var desired_index = $(event.target).val() * 1;
+ if(!isNaN(desired_index) && desired_index >= 0) {
+ var $row =
$(event.target).parents('div.grp-dynamic-form');
+ var $table =
$row.parents('div.grp-items.ui-sortable');
+ $row.detach();
+ var $row_desired =
$table.children('div.grp-dynamic-form').get(desired_index);
+ if($row_desired) {
+ $row.insertBefore($row_desired);
+ $row.find('h3,div.grp-row').effect('highlight',
{color:"#ffffcc"}, 2000);
+ } else {
+ // FIXME: this appends the new row to the very
end of the table.
+ // instead, it should be added after the last
row with values.
+ $table.append($row);
+ $row.find('h3,div.grp-row').effect('highlight',
{color:"#ffffcc"}, 2000);
+ }
+ }
}
});
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/grappelli/templates/admin/index.html
new/django-grappelli-2.14.2/grappelli/templates/admin/index.html
--- old/django-grappelli-2.14.1/grappelli/templates/admin/index.html
2020-02-10 15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/templates/admin/index.html
2020-05-14 15:15:52.000000000 +0200
@@ -66,9 +66,9 @@
</div>
<div class="g-d-6 g-d-l">
<div class="grp-module" id="grp-recent-actions-module">
- <h2>{% trans 'Recent Actions' %}</h2>
+ <h2>{% trans 'Recent actions' %}</h2>
<div class="grp-module">
- <h3>{% trans 'My Actions' %}</h3>
+ <h3>{% trans 'My actions' %}</h3>
{% get_admin_log 10 as admin_log for_user user %}
{% if not admin_log %}
<div class="grp-row"><p>{% trans 'None available'
%}</p></div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/grappelli/tests/models.py
new/django-grappelli-2.14.2/grappelli/tests/models.py
--- old/django-grappelli-2.14.1/grappelli/tests/models.py 2020-02-10
15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/grappelli/tests/models.py 2020-05-14
15:15:52.000000000 +0200
@@ -4,10 +4,7 @@
from django.contrib.auth.models import User
from django.db import models
-from six import python_2_unicode_compatible
-
-@python_2_unicode_compatible
class Category(models.Model):
name = models.CharField("Title", max_length=50, unique=True)
@@ -27,7 +24,6 @@
return "%s (%s)" % (self.name, self.id)
-@python_2_unicode_compatible
class Entry(models.Model):
title = models.CharField("Title", max_length=200)
category = models.ForeignKey(Category, on_delete=models.SET_NULL,
related_name="entries", blank=True, null=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/package.json
new/django-grappelli-2.14.2/package.json
--- old/django-grappelli-2.14.1/package.json 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/package.json 2020-05-14 15:15:52.000000000
+0200
@@ -1,6 +1,6 @@
{
"name": "Grappelli",
- "version": "2.14.1",
+ "version": "2.14.2",
"description": "A jazzy skin for the Django admin interface",
"author": "Patrick Kranzlmueller, Axel Swoboda",
"license": "New BSD",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-grappelli-2.14.1/requirements/requirements-testing.txt
new/django-grappelli-2.14.2/requirements/requirements-testing.txt
--- old/django-grappelli-2.14.1/requirements/requirements-testing.txt
2020-02-10 15:28:17.000000000 +0100
+++ new/django-grappelli-2.14.2/requirements/requirements-testing.txt
2020-05-14 15:15:52.000000000 +0200
@@ -2,4 +2,3 @@
py==1.8.0
pytest-django==3.6.0
pytest==5.2.1
-six==1.13.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-grappelli-2.14.1/setup.py
new/django-grappelli-2.14.2/setup.py
--- old/django-grappelli-2.14.1/setup.py 2020-02-10 15:28:17.000000000
+0100
+++ new/django-grappelli-2.14.2/setup.py 2020-05-14 15:15:52.000000000
+0200
@@ -9,7 +9,7 @@
setup(
name='django-grappelli',
- version='2.14.1',
+ version='2.14.2',
description='A jazzy skin for the Django Admin-Interface.',
long_description=read('README.rst'),
url='http://django-grappelli.readthedocs.org',
@@ -19,9 +19,7 @@
license='BSD',
packages=find_packages(exclude=['test_project']),
include_package_data=True,
- install_requires=[
- 'six',
- ],
+ install_requires=[],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
@@ -32,6 +30,7 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
],
zip_safe=False,
)
