Hello community,
here is the log from the commit of package python-django-tagging for
openSUSE:Factory checked in at 2020-04-04 12:26:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-tagging (Old)
and /work/SRC/openSUSE:Factory/.python-django-tagging.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-tagging"
Sat Apr 4 12:26:01 2020 rev:2 rq:791163 version:0.5.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-tagging/python-django-tagging.changes
2018-10-04 19:02:44.927124238 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-tagging.new.3248/python-django-tagging.changes
2020-04-04 12:26:51.588016515 +0200
@@ -1,0 +2,7 @@
+Fri Apr 3 10:29:23 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.5.0:
+ * Drop support for Python 2.
+ * Compatiblity fix for Django 2.2 and Django 3.0.
+
+-------------------------------------------------------------------
Old:
----
django-tagging-0.4.6.tar.gz
New:
----
django-tagging-0.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-tagging.spec ++++++
--- /var/tmp/diff_new_pack.JBhYeT/_old 2020-04-04 12:26:52.304017255 +0200
+++ /var/tmp/diff_new_pack.JBhYeT/_new 2020-04-04 12:26:52.308017259 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django-tagging
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,20 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-django-tagging
-Version: 0.4.6
+Version: 0.5.0
Release: 0
Summary: A generic tagging application for Django projects
License: MIT
Group: Development/Libraries/Python
URL: https://github.com/Fantomas42/django-tagging
Source:
https://files.pythonhosted.org/packages/source/d/django-tagging/django-tagging-%{version}.tar.gz
-BuildRequires: %{python_module Django}
+BuildRequires: %{python_module Django >= 2.2}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-Django >= 1.8
+Requires: python-Django >= 2.2
BuildArch: noarch
%python_subpackages
++++++ django-tagging-0.4.6.tar.gz -> django-tagging-0.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/CHANGELOG.txt
new/django-tagging-0.5.0/CHANGELOG.txt
--- old/django-tagging-0.4.6/CHANGELOG.txt 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/CHANGELOG.txt 2020-03-06 18:59:32.000000000
+0100
@@ -2,6 +2,18 @@
Django Tagging Changelog
========================
+Version 0.5.0, 6th March 2020:
+------------------------------
+
+* Drop support for Python 2.
+* Compatiblity fix for Django 2.2 and Django 3.0.
+
+Version 0.4.6, 14th October 2017:
+---------------------------------
+
+* Fix IntegrityError while saving inconsistent tags
+* Update tag name length to use MAX_TAG_LENGTH setting
+
Version 0.4.5, 6th September 2016:
----------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/MANIFEST.in
new/django-tagging-0.5.0/MANIFEST.in
--- old/django-tagging-0.4.6/MANIFEST.in 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/MANIFEST.in 2020-03-06 18:56:16.000000000
+0100
@@ -4,7 +4,6 @@
include README.rst
include versions.cfg
include buildout.cfg
-include bootstrap.py
recursive-include docs *
recursive-include tagging/tests *.txt
prune docs/_build
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/PKG-INFO
new/django-tagging-0.5.0/PKG-INFO
--- old/django-tagging-0.4.6/PKG-INFO 2017-10-14 23:16:38.000000000 +0200
+++ new/django-tagging-0.5.0/PKG-INFO 2020-03-06 19:00:19.561556800 +0100
@@ -1,12 +1,13 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: django-tagging
-Version: 0.4.6
+Version: 0.5.0
Summary: Generic tagging application for Django
Home-page: https://github.com/Fantomas42/django-tagging
-Author: Fantomas42
-Author-email: [email protected]
+Author: Jonathan Buchanan
+Author-email: [email protected]
+Maintainer: Fantomas42
+Maintainer-email: [email protected]
License: BSD License
-Description-Content-Type: UNKNOWN
Description: ==============
Django Tagging
==============
@@ -17,8 +18,8 @@
https://django-tagging.readthedocs.io/
- Note that this application requires Python 2.7 or later, and Django
- 1.8 or later. You can obtain Python from http://www.python.org/ and
+ Note that this application version requires Python 3.5 or later, and
Django
+ 1.11 or later. You can obtain Python from http://www.python.org/ and
Django from http://www.djangoproject.com/.
.. |travis-develop| image::
https://travis-ci.org/Fantomas42/django-tagging.png?branch=develop
@@ -32,6 +33,18 @@
Django Tagging Changelog
========================
+ Version 0.5.0, 6th March 2020:
+ ------------------------------
+
+ * Drop support for Python 2.
+ * Compatiblity fix for Django 2.2 and Django 3.0.
+
+ Version 0.4.6, 14th October 2017:
+ ---------------------------------
+
+ * Fix IntegrityError while saving inconsistent tags
+ * Update tag name length to use MAX_TAG_LENGTH setting
+
Version 0.4.5, 6th September 2016:
----------------------------------
@@ -212,8 +225,6 @@
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: BSD License
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Topic :: Utilities
Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/README.rst
new/django-tagging-0.5.0/README.rst
--- old/django-tagging-0.4.6/README.rst 2017-10-14 23:15:51.000000000 +0200
+++ new/django-tagging-0.5.0/README.rst 2020-03-06 18:56:16.000000000 +0100
@@ -8,8 +8,8 @@
https://django-tagging.readthedocs.io/
-Note that this application requires Python 2.7 or later, and Django
-1.8 or later. You can obtain Python from http://www.python.org/ and
+Note that this application version requires Python 3.5 or later, and Django
+1.11 or later. You can obtain Python from http://www.python.org/ and
Django from http://www.djangoproject.com/.
.. |travis-develop| image::
https://travis-ci.org/Fantomas42/django-tagging.png?branch=develop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/django_tagging.egg-info/PKG-INFO
new/django-tagging-0.5.0/django_tagging.egg-info/PKG-INFO
--- old/django-tagging-0.4.6/django_tagging.egg-info/PKG-INFO 2017-10-14
23:16:38.000000000 +0200
+++ new/django-tagging-0.5.0/django_tagging.egg-info/PKG-INFO 2020-03-06
19:00:19.000000000 +0100
@@ -1,12 +1,13 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: django-tagging
-Version: 0.4.6
+Version: 0.5.0
Summary: Generic tagging application for Django
Home-page: https://github.com/Fantomas42/django-tagging
-Author: Fantomas42
-Author-email: [email protected]
+Author: Jonathan Buchanan
+Author-email: [email protected]
+Maintainer: Fantomas42
+Maintainer-email: [email protected]
License: BSD License
-Description-Content-Type: UNKNOWN
Description: ==============
Django Tagging
==============
@@ -17,8 +18,8 @@
https://django-tagging.readthedocs.io/
- Note that this application requires Python 2.7 or later, and Django
- 1.8 or later. You can obtain Python from http://www.python.org/ and
+ Note that this application version requires Python 3.5 or later, and
Django
+ 1.11 or later. You can obtain Python from http://www.python.org/ and
Django from http://www.djangoproject.com/.
.. |travis-develop| image::
https://travis-ci.org/Fantomas42/django-tagging.png?branch=develop
@@ -32,6 +33,18 @@
Django Tagging Changelog
========================
+ Version 0.5.0, 6th March 2020:
+ ------------------------------
+
+ * Drop support for Python 2.
+ * Compatiblity fix for Django 2.2 and Django 3.0.
+
+ Version 0.4.6, 14th October 2017:
+ ---------------------------------
+
+ * Fix IntegrityError while saving inconsistent tags
+ * Update tag name length to use MAX_TAG_LENGTH setting
+
Version 0.4.5, 6th September 2016:
----------------------------------
@@ -212,8 +225,6 @@
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: BSD License
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Topic :: Utilities
Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/django_tagging.egg-info/SOURCES.txt
new/django-tagging-0.5.0/django_tagging.egg-info/SOURCES.txt
--- old/django-tagging-0.4.6/django_tagging.egg-info/SOURCES.txt
2017-10-14 23:16:38.000000000 +0200
+++ new/django-tagging-0.5.0/django_tagging.egg-info/SOURCES.txt
2020-03-06 19:00:19.000000000 +0100
@@ -3,7 +3,6 @@
MANIFEST.in
README.rst
buildout.cfg
-setup.cfg
setup.py
versions.cfg
django_tagging.egg-info/PKG-INFO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/setup.cfg
new/django-tagging-0.5.0/setup.cfg
--- old/django-tagging-0.4.6/setup.cfg 2017-10-14 23:16:38.000000000 +0200
+++ new/django-tagging-0.5.0/setup.cfg 2020-03-06 19:00:19.561556800 +0100
@@ -1,6 +1,3 @@
-[wheel]
-universal = 1
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/setup.py
new/django-tagging-0.5.0/setup.py
--- old/django-tagging-0.4.6/setup.py 2017-10-14 22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/setup.py 2020-03-06 18:56:16.000000000 +0100
@@ -1,8 +1,8 @@
"""
Based entirely on Django's own ``setup.py``.
"""
-from setuptools import setup
from setuptools import find_packages
+from setuptools import setup
import tagging
@@ -34,8 +34,6 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Topic :: Utilities',
'Topic :: Software Development :: Libraries :: Python Modules']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/__init__.py
new/django-tagging-0.5.0/tagging/__init__.py
--- old/django-tagging-0.4.6/tagging/__init__.py 2017-10-14
23:16:06.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/__init__.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,7 +1,7 @@
"""
Django-tagging
"""
-__version__ = '0.4.6'
+__version__ = '0.5.0'
__license__ = 'BSD License'
__author__ = 'Jonathan Buchanan'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/admin.py
new/django-tagging-0.5.0/tagging/admin.py
--- old/django-tagging-0.4.6/tagging/admin.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/admin.py 2020-03-06 18:56:16.000000000
+0100
@@ -3,9 +3,9 @@
"""
from django.contrib import admin
+from tagging.forms import TagAdminForm
from tagging.models import Tag
from tagging.models import TaggedItem
-from tagging.forms import TagAdminForm
class TagAdmin(admin.ModelAdmin):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/apps.py
new/django-tagging-0.5.0/tagging/apps.py
--- old/django-tagging-0.4.6/tagging/apps.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/apps.py 2020-03-06 18:56:16.000000000
+0100
@@ -2,7 +2,7 @@
Apps for tagging.
"""
from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
class TaggingConfig(AppConfig):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/fields.py
new/django-tagging-0.5.0/tagging/fields.py
--- old/django-tagging-0.4.6/tagging/fields.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/fields.py 2020-03-06 18:56:16.000000000
+0100
@@ -3,12 +3,12 @@
"""
from django.db.models import signals
from django.db.models.fields import CharField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from tagging import settings
+from tagging.forms import TagField as TagFormField
from tagging.models import Tag
from tagging.utils import edit_string_for_tags
-from tagging.forms import TagField as TagFormField
class TagField(CharField):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/forms.py
new/django-tagging-0.5.0/tagging/forms.py
--- old/django-tagging-0.4.6/tagging/forms.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/forms.py 2020-03-06 18:56:16.000000000
+0100
@@ -2,7 +2,7 @@
Form components for tagging.
"""
from django import forms
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
from tagging import settings
from tagging.models import Tag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/managers.py
new/django-tagging-0.5.0/tagging/managers.py
--- old/django-tagging-0.4.6/tagging/managers.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/managers.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,8 +1,8 @@
"""
Custom managers for tagging.
"""
-from django.db import models
from django.contrib.contenttypes.models import ContentType
+from django.db import models
from tagging.models import Tag
from tagging.models import TaggedItem
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/tagging/migrations/0001_initial.py
new/django-tagging-0.5.0/tagging/migrations/0001_initial.py
--- old/django-tagging-0.4.6/tagging/migrations/0001_initial.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/migrations/0001_initial.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,5 +1,5 @@
-from django.db import models
from django.db import migrations
+from django.db import models
class Migration(migrations.Migration):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/tagging/migrations/0002_on_delete.py
new/django-tagging-0.5.0/tagging/migrations/0002_on_delete.py
--- old/django-tagging-0.4.6/tagging/migrations/0002_on_delete.py
2017-10-14 22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/migrations/0002_on_delete.py
2020-03-06 18:56:16.000000000 +0100
@@ -1,6 +1,6 @@
-from django.db import models
-from django.db import migrations
import django.db.models.deletion
+from django.db import migrations
+from django.db import models
class Migration(migrations.Migration):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/tagging/migrations/0003_adapt_max_tag_length.py
new/django-tagging-0.5.0/tagging/migrations/0003_adapt_max_tag_length.py
--- old/django-tagging-0.4.6/tagging/migrations/0003_adapt_max_tag_length.py
2017-10-14 23:15:51.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/migrations/0003_adapt_max_tag_length.py
2020-03-06 18:56:16.000000000 +0100
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
from django.conf import settings
from django.db import migrations, models
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/models.py
new/django-tagging-0.5.0/tagging/models.py
--- old/django-tagging-0.4.6/tagging/models.py 2017-10-14 23:15:51.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/models.py 2020-03-06 18:56:16.000000000
+0100
@@ -1,20 +1,19 @@
"""
Models and managers for tagging.
"""
-from django.db import models
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
from django.db import connection
+from django.db import models
from django.utils.encoding import smart_text
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.fields import GenericForeignKey
+from django.utils.translation import gettext_lazy as _
from tagging import settings
from tagging.utils import LOGARITHMIC
-from tagging.utils import get_tag_list
from tagging.utils import calculate_cloud
-from tagging.utils import parse_tag_input
from tagging.utils import get_queryset_and_model
+from tagging.utils import get_tag_list
+from tagging.utils import parse_tag_input
qn = connection.ops.quote_name
@@ -435,12 +434,8 @@
GROUP BY %(model_pk)s
ORDER BY %(count)s DESC
%(limit_offset)s"""
- try:
- tagging_table = qn(self.model._meta.get_field(
- 'tag').remote_field.model._meta.db_table)
- except AttributeError: # Django < 1.9
- tagging_table = qn(self.model._meta.get_field(
- 'tag').rel.to._meta.db_table)
+ tagging_table = qn(self.model._meta.get_field(
+ 'tag').remote_field.model._meta.db_table)
query = query % {
'model_pk': '%s.%s' % (model_table, qn(model._meta.pk.column)),
'count': qn('count'),
@@ -474,7 +469,6 @@
# Models #
##########
-@python_2_unicode_compatible
class Tag(models.Model):
"""
A tag.
@@ -494,7 +488,6 @@
return self.name
-@python_2_unicode_compatible
class TaggedItem(models.Model):
"""
Holds the relationship between a tag and the item being tagged.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/registry.py
new/django-tagging-0.5.0/tagging/registry.py
--- old/django-tagging-0.4.6/tagging/registry.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/registry.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,8 +1,8 @@
"""
Registery for tagging.
"""
-from tagging.managers import TagDescriptor
from tagging.managers import ModelTaggedItemManager
+from tagging.managers import TagDescriptor
registry = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-tagging-0.4.6/tagging/templatetags/tagging_tags.py
new/django-tagging-0.5.0/tagging/templatetags/tagging_tags.py
--- old/django-tagging-0.4.6/tagging/templatetags/tagging_tags.py
2017-10-14 22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/templatetags/tagging_tags.py
2020-03-06 18:56:16.000000000 +0100
@@ -1,17 +1,17 @@
"""
Templatetags for tagging.
"""
-from django.template import Node
+from django.apps.registry import apps
from django.template import Library
-from django.template import Variable
+from django.template import Node
from django.template import TemplateSyntaxError
-from django.apps.registry import apps
-from django.utils.translation import ugettext as _
+from django.template import Variable
+from django.utils.translation import gettext as _
-from tagging.utils import LINEAR
-from tagging.utils import LOGARITHMIC
from tagging.models import Tag
from tagging.models import TaggedItem
+from tagging.utils import LINEAR
+from tagging.utils import LOGARITHMIC
register = Library()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/tests/models.py
new/django-tagging-0.5.0/tagging/tests/models.py
--- old/django-tagging-0.4.6/tagging/tests/models.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/tests/models.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,5 +1,4 @@
from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
from tagging.fields import TagField
@@ -9,7 +8,6 @@
smelly = models.BooleanField(default=True)
-@python_2_unicode_compatible
class Parrot(models.Model):
state = models.CharField(max_length=50)
perch = models.ForeignKey(Perch, null=True,
@@ -22,7 +20,6 @@
ordering = ['state']
-@python_2_unicode_compatible
class Link(models.Model):
name = models.CharField(max_length=50)
@@ -33,7 +30,6 @@
ordering = ['name']
-@python_2_unicode_compatible
class Article(models.Model):
name = models.CharField(max_length=50)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/tests/settings.py
new/django-tagging-0.5.0/tagging/tests/settings.py
--- old/django-tagging-0.4.6/tagging/tests/settings.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/tests/settings.py 2020-03-06
18:56:16.000000000 +0100
@@ -26,7 +26,10 @@
'ENGINE': 'django.db.backends.mysql',
'NAME': 'zinnia',
'USER': 'root',
- 'HOST': 'localhost'
+ 'HOST': 'localhost',
+ 'TEST': {
+ 'COLLATION': 'utf8_general_ci'
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/tests/tests.py
new/django-tagging-0.5.0/tagging/tests/tests.py
--- old/django-tagging-0.4.6/tagging/tests/tests.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/tests/tests.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,35 +1,31 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
import os
from django import forms
-from django.utils import six
+from django.core.exceptions import ImproperlyConfigured
from django.db.models import Q
from django.test import TestCase
from django.test.utils import override_settings
-from django.core.exceptions import ImproperlyConfigured
from tagging import settings
-from tagging.forms import TagField
from tagging.forms import TagAdminForm
+from tagging.forms import TagField
from tagging.models import Tag
from tagging.models import TaggedItem
from tagging.tests.models import Article
-from tagging.tests.models import Link
-from tagging.tests.models import Perch
-from tagging.tests.models import Parrot
+from tagging.tests.models import FormMultipleFieldTest
from tagging.tests.models import FormTest
from tagging.tests.models import FormTestNull
-from tagging.tests.models import FormMultipleFieldTest
+from tagging.tests.models import Link
+from tagging.tests.models import Parrot
+from tagging.tests.models import Perch
from tagging.utils import LINEAR
from tagging.utils import LOGARITHMIC
+from tagging.utils import _calculate_tag_weight
+from tagging.utils import calculate_cloud
+from tagging.utils import edit_string_for_tags
from tagging.utils import get_tag
from tagging.utils import get_tag_list
-from tagging.utils import calculate_cloud
from tagging.utils import parse_tag_input
-from tagging.utils import edit_string_for_tags
-from tagging.utils import _calculate_tag_weight
#############
# Utilities #
@@ -385,7 +381,7 @@
Tag.objects.update_tags(self.dead_parrot, 'föo')
items = TaggedItem.objects.all()
self.assertEqual(len(items), 1)
- self.assertEqual(six.text_type(items[0]), "dëad [föo]")
+ self.assertEqual(str(items[0]), "dëad [föo]")
def test_update_tags_with_none(self):
# start off in a known, mildly interesting state
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/tests/urls.py
new/django-tagging-0.5.0/tagging/tests/urls.py
--- old/django-tagging-0.4.6/tagging/tests/urls.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/tests/urls.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,8 +1,8 @@
"""Test urls for tagging."""
from django.conf.urls import url
-from tagging.views import TaggedObjectList
from tagging.tests.models import Article
+from tagging.views import TaggedObjectList
class StaticTaggedObjectList(TaggedObjectList):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/tests/utils.py
new/django-tagging-0.5.0/tagging/tests/utils.py
--- old/django-tagging-0.4.6/tagging/tests/utils.py 2017-10-14
22:59:45.000000000 +0200
+++ new/django-tagging-0.5.0/tagging/tests/utils.py 2020-03-06
18:56:16.000000000 +0100
@@ -1,14 +1,8 @@
"""
Tests utils for tagging.
"""
+from django.template import Origin
from django.template.loaders.base import Loader
-try:
- from django.template import Origin
-except ImportError:
- class Origin(object):
- def __init__(self, **kwargs):
- for k, v in kwargs.items():
- setattr(self, k, v)
class VoidLoader(Loader):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/utils.py
new/django-tagging-0.5.0/tagging/utils.py
--- old/django-tagging-0.4.6/tagging/utils.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/utils.py 2020-03-06 18:56:16.000000000
+0100
@@ -4,10 +4,9 @@
"""
import math
-from django.utils import six
from django.db.models.query import QuerySet
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext as _
+from django.utils.encoding import force_str
+from django.utils.translation import gettext as _
# Font size distribution algorithms
LOGARITHMIC, LINEAR = 1, 2
@@ -24,7 +23,7 @@
if not input:
return []
- input = force_text(input)
+ input = force_str(input)
# Special case - if there are no commas or double quotes in the
# input, we don't *do* a recall... I mean, we know we only need to
@@ -171,22 +170,22 @@
return [tags]
elif isinstance(tags, QuerySet) and tags.model is Tag:
return tags
- elif isinstance(tags, six.string_types):
+ elif isinstance(tags, str):
return Tag.objects.filter(name__in=parse_tag_input(tags))
elif isinstance(tags, (list, tuple)):
if len(tags) == 0:
return tags
contents = set()
for item in tags:
- if isinstance(item, six.string_types):
+ if isinstance(item, str):
contents.add('string')
elif isinstance(item, Tag):
contents.add('tag')
- elif isinstance(item, six.integer_types):
+ elif isinstance(item, int):
contents.add('int')
if len(contents) == 1:
if 'string' in contents:
- return Tag.objects.filter(name__in=[force_text(tag)
+ return Tag.objects.filter(name__in=[force_str(tag)
for tag in tags])
elif 'tag' in contents:
return tags
@@ -216,9 +215,9 @@
return tag
try:
- if isinstance(tag, six.string_types):
+ if isinstance(tag, str):
return Tag.objects.get(name=tag)
- elif isinstance(tag, six.integer_types):
+ elif isinstance(tag, int):
return Tag.objects.get(id=tag)
except Tag.DoesNotExist:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/tagging/views.py
new/django-tagging-0.5.0/tagging/views.py
--- old/django-tagging-0.4.6/tagging/views.py 2017-10-14 22:59:45.000000000
+0200
+++ new/django-tagging-0.5.0/tagging/views.py 2020-03-06 18:56:16.000000000
+0100
@@ -1,15 +1,15 @@
"""
Tagging related views.
"""
+from django.core.exceptions import ImproperlyConfigured
from django.http import Http404
+from django.utils.translation import gettext as _
from django.views.generic.list import ListView
-from django.utils.translation import ugettext as _
-from django.core.exceptions import ImproperlyConfigured
from tagging.models import Tag
from tagging.models import TaggedItem
-from tagging.utils import get_tag
from tagging.utils import get_queryset_and_model
+from tagging.utils import get_tag
class TaggedObjectList(ListView):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-tagging-0.4.6/versions.cfg
new/django-tagging-0.5.0/versions.cfg
--- old/django-tagging-0.4.6/versions.cfg 2017-10-14 23:15:51.000000000
+0200
+++ new/django-tagging-0.5.0/versions.cfg 2020-03-06 18:56:16.000000000
+0100
@@ -1,28 +1,31 @@
[versions]
-blessings = 1.6
-buildout-versions-checker = 1.9.4
-certifi = 2017.7.27.1
+asgiref = 3.2.3
+blessings = 1.7
+buildout-versions-checker = 1.10.0
+certifi = 2019.11.28
chardet = 3.0.4
-configparser = 3.5.0
-coverage = 4.0.3
-django = 1.11.6
-enum34 = 1.1.6
-flake8 = 3.4.1
-futures = 3.1.1
-idna = 2.6
+configparser = 4.0.2
+coverage = 5.0.3
+django = 3.0.4
+entrypoints = 0.3
+enum34 = 1.1.9
+flake8 = 3.7.9
+futures = 3.3.0
+idna = 2.9
mccabe = 0.6.1
nose = 1.3.7
-nose-progressive = 1.5.1
+nose-progressive = 1.5.2
nose-sfd = 0.4
-packaging = 16.8
+packaging = 20.3
pbp.recipe.noserunner = 0.2.6
-pycodestyle = 2.3.1
-pyflakes = 1.5.0
-pyparsing = 2.2.0
-python-coveralls = 2.9.1
-pytz = 2017.2
-PyYAML = 3.12
-requests = 2.18.4
-six = 1.11.0
-urllib3 = 1.22
-zc.recipe.egg = 2.0.4
+pycodestyle = 2.5.0
+pyflakes = 2.1.1
+pyparsing = 2.4.6
+python-coveralls = 2.9.3
+pytz = 2019.3
+PyYAML = 5.3
+requests = 2.23.0
+six = 1.14.0
+sqlparse = 0.3.1
+urllib3 = 1.25.8
+zc.recipe.egg = 2.0.7
