Hello community,
here is the log from the commit of package python-django-classy-tags for
openSUSE:Factory checked in at 2019-05-20 13:18:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-classy-tags (Old)
and /work/SRC/openSUSE:Factory/.python-django-classy-tags.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-classy-tags"
Mon May 20 13:18:44 2019 rev:2 rq:704169 version:0.9.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-classy-tags/python-django-classy-tags.changes
2019-01-11 14:04:36.327853399 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-classy-tags.new.5148/python-django-classy-tags.changes
2019-05-20 13:18:48.703890531 +0200
@@ -1,0 +2,7 @@
+Mon May 20 08:43:34 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.9.0:
+ * Fix with new python/django
+- Remove merged django2.patch
+
+-------------------------------------------------------------------
Old:
----
0.8.0.tar.gz
django2.patch
New:
----
0.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-classy-tags.spec ++++++
--- /var/tmp/diff_new_pack.d9nkYZ/_old 2019-05-20 13:18:49.527889732 +0200
+++ /var/tmp/diff_new_pack.d9nkYZ/_new 2019-05-20 13:18:49.531889728 +0200
@@ -18,17 +18,17 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-django-classy-tags
-Version: 0.8.0
+Version: 0.9.0
Release: 0
Summary: Class based template tags for Django
License: MIT
Group: Development/Languages/Python
URL: http://github.com/ojii/django-classy-tags
Source:
https://github.com/divio/django-classy-tags/archive/%{version}.tar.gz
-Patch0: django2.patch
BuildRequires: %{python_module Django >= 1.11}
BuildRequires: %{python_module setuptools}
-BuildRequires: python-rpm-macros fdupes
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
Requires: python-Django >= 1.11
BuildArch: noarch
%python_subpackages
@@ -39,7 +39,6 @@
%prep
%setup -q -n django-classy-tags-%{version}
-%patch0 -p1
%build
%python_build
++++++ 0.8.0.tar.gz -> 0.9.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/.travis.yml
new/django-classy-tags-0.9.0/.travis.yml
--- old/django-classy-tags-0.8.0/.travis.yml 2016-08-28 06:08:44.000000000
+0200
+++ new/django-classy-tags-0.9.0/.travis.yml 2019-05-16 14:04:32.000000000
+0200
@@ -1,44 +1,23 @@
language: python
python:
- 2.7
- - 3.3
- 3.4
- 3.5
+ - 3.6
env:
- - DJANGO='django>=1.3,<1.4'
- - DJANGO='django>=1.4,<1.5'
- - DJANGO='django>=1.5,<1.6'
- - DJANGO='django>=1.6,<1.7'
- - DJANGO='django>=1.7,<1.8'
- - DJANGO='django>=1.8,<1.9'
- - DJANGO='django>=1.9,<1.10'
- - DJANGO='django>=1.10,<1.11'
+ - DJANGO='django>=1.11,<2.0'
+ - DJANGO='django>=2.0,<2.1'
+ - DJANGO='django>=2.1,<2.2'
sudo: false
install:
- pip install $DJANGO
script:
- python runtests.py
matrix:
- exclude:
- - python: 3.3
- env: DJANGO='django>=1.3,<1.4'
- - python: 3.3
- env: DJANGO='django>=1.4,<1.5'
- - python: 3.3
- env: DJANGO='django>=1.9,<1.10'
- - python: 3.3
- env: DJANGO='django>=1.10,<1.11'
- - python: 3.4
- env: DJANGO='django>=1.3,<1.4'
- - python: 3.4
- env: DJANGO='django>=1.4,<1.5'
- - python: 3.5
- env: DJANGO='django>=1.3,<1.4'
- - python: 3.5
- env: DJANGO='django>=1.4,<1.5'
- - python: 3.5
- env: DJANGO='django>=1.5,<1.6'
- - python: 3.5
- env: DJANGO='django>=1.6,<1.7'
- - python: 3.5
- env: DJANGO='django>=1.7,<1.8'
+ exclude:
+ - python: 2.7
+ env: DJANGO='django>=2.0,<2.1'
+ - python: 2.7
+ env: DJANGO='django>=2.1,<2.2'
+ - python: 3.4
+ env: DJANGO='django>=2.1,<2.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/README.rst
new/django-classy-tags-0.9.0/README.rst
--- old/django-classy-tags-0.8.0/README.rst 2016-08-28 06:08:44.000000000
+0200
+++ new/django-classy-tags-0.9.0/README.rst 2019-05-16 14:04:32.000000000
+0200
@@ -31,7 +31,9 @@
For the impatient
*****************
-This is how a tag looks like using django-classy-tags::
+This is how a tag looks like using django-classy-tags:
+
+.. code-block:: python
from classytags.core import Options
from classytags.helpers import AsTag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/__init__.py
new/django-classy-tags-0.9.0/classytags/__init__.py
--- old/django-classy-tags-0.8.0/classytags/__init__.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/__init__.py 2019-05-16
14:04:32.000000000 +0200
@@ -1 +1 @@
-__version__ = '0.8.0'
+__version__ = '0.9.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/compat.py
new/django-classy-tags-0.9.0/classytags/compat.py
--- old/django-classy-tags-0.8.0/classytags/compat.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/compat.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# flake8: noqa
-
-try: # pragma: no cover
- compat_basestring = basestring
-except NameError:
- compat_basestring = str
-
-try:
- compat_next = next
-except NameError: # pragma: no cover
- def compat_next(it):
- return it.next()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/core.py
new/django-classy-tags-0.9.0/classytags/core.py
--- old/django-classy-tags-0.8.0/classytags/core.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/core.py 2019-05-16
14:04:32.000000000 +0200
@@ -1,9 +1,9 @@
from operator import attrgetter
from django.template import Node
+from django.utils import six
from classytags.blocks import BlockDefinition
-from classytags.compat import compat_basestring
from classytags.parser import Parser
from classytags.utils import StructuredOptions
from classytags.utils import get_default_name
@@ -25,8 +25,8 @@
self.options[current_breakpoint] = []
self.all_argument_names = []
for value in options:
- if isinstance(value, compat_basestring):
- if isinstance(last, compat_basestring):
+ if isinstance(value, six.string_types):
+ if isinstance(last, six.string_types):
self.combined_breakpoints[last] = value
self.breakpoints.append(value)
current_breakpoint = value
@@ -39,7 +39,7 @@
for block in kwargs.get('blocks', []):
if isinstance(block, BlockDefinition):
block_definition = block
- elif isinstance(block, compat_basestring):
+ elif isinstance(block, six.string_types):
block_definition = BlockDefinition(block, block)
else:
block_definition = BlockDefinition(block[1], block[0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-classy-tags-0.8.0/classytags/test/context_managers.py
new/django-classy-tags-0.9.0/classytags/test/context_managers.py
--- old/django-classy-tags-0.8.0/classytags/test/context_managers.py
2016-08-28 06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/test/context_managers.py
2019-05-16 14:04:32.000000000 +0200
@@ -1,14 +1,9 @@
# -*- coding: utf-8 -*-
from django import template
from django.conf import settings
+from django.template.engine import Engine
-
-try:
- Engine = None
- builtins = template.base.builtins
-except AttributeError:
- from django.template.engine import Engine
- builtins = Engine.get_default().template_builtins
+builtins = Engine.get_default().template_builtins
class NULL:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/tests.py
new/django-classy-tags-0.9.0/classytags/tests.py
--- old/django-classy-tags-0.8.0/classytags/tests.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/tests.py 2019-05-16
14:04:32.000000000 +0200
@@ -1,17 +1,14 @@
-from __future__ import with_statement
-
import os
import sys
import warnings
-from distutils.version import LooseVersion
import operator
from unittest import TestCase
-import django
from django import template
from django.core.exceptions import ImproperlyConfigured
from django.template import Context, RequestContext
from django.test import RequestFactory
+from django.utils import six
from classytags import arguments
from classytags import core
@@ -22,17 +19,9 @@
from classytags import values
from classytags.blocks import BlockDefinition
from classytags.blocks import VariableBlockName
-from classytags.compat import compat_next
from classytags.test.context_managers import SettingsOverride
from classytags.test.context_managers import TemplateTags
-DJANGO_1_4_OR_HIGHER = (
- LooseVersion(django.get_version()) >= LooseVersion('1.4')
-)
-DJANGO_1_5_OR_HIGHER = (
- LooseVersion(django.get_version()) >= LooseVersion('1.5')
-)
-
CLASSY_TAGS_DIR = os.path.abspath(os.path.dirname(__file__))
@@ -539,7 +528,7 @@
if self not in context.render_context:
context.render_context[self] = itertools_cycle(values)
cycle_iter = context.render_context[self]
- value = compat_next(cycle_iter)
+ value = six.next(cycle_iter)
if varname:
context[varname] = value
return value
@@ -835,21 +824,16 @@
arguments.Argument('varname', resolve=False),
)
- if DJANGO_1_4_OR_HIGHER:
- exc_class = NotImplementedError
- else: # pragma: no cover
- exc_class = template.TemplateSyntaxError
-
with TemplateTags(Fail, Fail2, Fail3, Fail4):
context = template.Context({})
tpl = template.Template("{% fail %}")
- self.assertRaises(exc_class, tpl.render, context)
+ self.assertRaises(NotImplementedError, tpl.render, context)
self.assertRaises(ImproperlyConfigured,
template.Template, "{% fail2 %}")
self.assertRaises(ImproperlyConfigured,
template.Template, "{% fail3 %}")
tpl = template.Template("{% fail4 as something %}")
- self.assertRaises(exc_class, tpl.render, context)
+ self.assertRaises(NotImplementedError, tpl.render, context)
def test_too_many_arguments(self):
class NoArg(core.Tag):
@@ -1470,13 +1454,10 @@
expected = {
'foo': 'test',
'bar': 'baz',
+ 'None': None,
+ 'True': True,
+ 'False': False,
}
- if DJANGO_1_5_OR_HIGHER:
- expected.update({
- 'None': None,
- 'True': True,
- 'False': False,
- })
self.assertEqual(flat, expected)
context.flatten = None
flat = utils.flatten_context(context)
@@ -1491,13 +1472,10 @@
'foo': 'test',
'request': 'bar',
'bar': 'baz',
+ 'None': None,
+ 'True': True,
+ 'False': False,
}
- if DJANGO_1_5_OR_HIGHER:
- expected.update({
- 'None': None,
- 'True': True,
- 'False': False,
- })
checked_keys = expected.keys()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/utils.py
new/django-classy-tags-0.9.0/classytags/utils.py
--- old/django-classy-tags-0.8.0/classytags/utils.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/utils.py 2019-05-16
14:04:32.000000000 +0200
@@ -1,15 +1,9 @@
import re
from copy import copy
-from distutils.version import LooseVersion
-from classytags.compat import compat_basestring
-from django import get_version
from django.template import Context, RequestContext
from django.template.context import BaseContext
-
-DJANGO_1_9_OR_HIGHER = (
- LooseVersion(get_version()) >= LooseVersion('1.9')
-)
+from django.utils import six
class NULL:
@@ -25,7 +19,7 @@
"""
def __init__(self, value):
self.literal = value
- if isinstance(value, compat_basestring):
+ if isinstance(value, six.string_types):
self.value = value.strip('"\'')
else:
self.value = value
@@ -102,7 +96,7 @@
flat.update(d)
return flat
- if callable(getattr(context, 'flatten', None)) and DJANGO_1_9_OR_HIGHER:
+ if callable(getattr(context, 'flatten', None)):
return context.flatten()
elif isinstance(context, BaseContext):
return do_flatten(context)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/classytags/values.py
new/django-classy-tags-0.9.0/classytags/values.py
--- old/django-classy-tags-0.8.0/classytags/values.py 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/classytags/values.py 2019-05-16
14:04:32.000000000 +0200
@@ -2,8 +2,8 @@
from django import template
from django.conf import settings
+from django.utils import six
-from classytags.compat import compat_basestring
from classytags.exceptions import TemplateSyntaxWarning
@@ -48,7 +48,7 @@
value_on_error = ""
def clean(self, value):
- if not isinstance(value, compat_basestring):
+ if not isinstance(value, six.string_types):
return self.error(value, "clean")
return value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/docs/changes.rst
new/django-classy-tags-0.9.0/docs/changes.rst
--- old/django-classy-tags-0.8.0/docs/changes.rst 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/docs/changes.rst 2019-05-16
14:04:32.000000000 +0200
@@ -2,6 +2,14 @@
Changelog
#########
+*****
+0.9.0
+*****
+
+* Added testing for Django 1.11, 2.0, and 2.1; and dropped testing for older
+ versions.
+* Added support for Python 3.6
+
*****
0.8.0
@@ -10,6 +18,7 @@
* Removed Python 2.6 support. Supported versions are now 2.7, 3.3, 3.4 and 3.5.
* Added support for Django 1.10.
+
*****
0.7.2
*****
@@ -94,7 +103,7 @@
* Fixed issue in :class:`classytags.arguments.MultiKeywordArgument` and
:class:`classytags.arguments.KeywordArgument` and their behavior when given
a default value.
-
+
*****
0.3.1
*****
@@ -111,7 +120,7 @@
* Added :class:`classytags.arguments.KeywordArgument`
* Added :class:`classytags.arguments.MultiKeywordArgument`
-* Added :class:`classytags.arguments.ChoiceArgument`
+* Added :class:`classytags.arguments.ChoiceArgument`
* Added ability to override the parser class in the initialization of the
:class:`classytags.core.Options` class, to make the usage of custom parsers
easier.
@@ -126,7 +135,7 @@
variable to store the value in, but no argument is given.
* Fixed :class:`classytags.helpers.InclusionTag` not validating the
``template``
attribute on initialization.
-
+
*****
0.2.1
*****
@@ -141,7 +150,7 @@
* Added :class:`classytags.arguments.IntegerArgument`
* Added more graceful failing in non-debug mode by using warnings instead of
exceptions.
-
+
*****
0.1.3
*****
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/docs/installation.rst
new/django-classy-tags-0.9.0/docs/installation.rst
--- old/django-classy-tags-0.8.0/docs/installation.rst 2016-08-28
06:08:44.000000000 +0200
+++ new/django-classy-tags-0.9.0/docs/installation.rst 2019-05-16
14:04:32.000000000 +0200
@@ -5,11 +5,9 @@
To install django-classy-tags, please use
``sudo pip install django-classy-tags``.
-If you don't want to use ``pip``, download the latest version from
+If you don't want to use ``pip``, download the latest version from
`pypi <http://pypi.python.org/pypi/django-classy-tags>`_, unpack the tarball
and
run ``sudo python setup.py install``.
-django-classy-tags has no dependencies other than Django. Django 1.3, 1.4, 1.5,
-1.6, 1.7, 1.8, 1.9 and 1.10 are supportd.
-
-django-classy-tags supports Python 2.7, 3.3, 3.4 and 3.5.
+django-classy-tags has no dependencies other than Django. Django 1.11 and
+later are supported.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/runtests.py
new/django-classy-tags-0.9.0/runtests.py
--- old/django-classy-tags-0.8.0/runtests.py 2016-08-28 06:08:44.000000000
+0200
+++ new/django-classy-tags-0.9.0/runtests.py 2019-05-16 14:04:32.000000000
+0200
@@ -2,12 +2,9 @@
import warnings
import os
import sys
-from django import VERSION
urlpatterns = []
-TEMPLATE_DEBUG = True
-
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
@@ -21,14 +18,7 @@
'classytags.test.project',
]
-TEMPLATE_DIRS = [
- os.path.join(os.path.dirname(__file__), 'test_templates'),
-]
-
-if VERSION >= (1,6):
- TEST_RUNNER = 'django.test.runner.DiscoverRunner'
-else:
- TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
ROOT_URLCONF = 'runtests'
@@ -36,9 +26,9 @@
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
- 'DIRS': TEMPLATE_DIRS,
+ 'DIRS': os.path.join(os.path.dirname(__file__), 'test_templates'),
'OPTIONS': {
- 'debug': TEMPLATE_DEBUG,
+ 'debug': True,
},
},
]
@@ -51,9 +41,6 @@
ROOT_URLCONF = ROOT_URLCONF,
DATABASES = DATABASES,
TEST_RUNNER = TEST_RUNNER,
- TEMPLATE_DIRS = TEMPLATE_DIRS,
- TEMPLATE_DEBUG = TEMPLATE_DEBUG,
- MIDDLEWARE_CLASSES = [],
TEMPLATES=TEMPLATES,
)
@@ -63,8 +50,7 @@
test_runner = TestRunner(verbosity=1, interactive=False, failfast=False)
warnings.simplefilter("ignore")
- if django.VERSION >= (1, 7):
- django.setup()
+ django.setup()
failures = test_runner.run_tests(['classytags'])
sys.exit(failures)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-classy-tags-0.8.0/setup.py
new/django-classy-tags-0.9.0/setup.py
--- old/django-classy-tags-0.8.0/setup.py 2016-08-28 06:08:44.000000000
+0200
+++ new/django-classy-tags-0.9.0/setup.py 2019-05-16 14:04:32.000000000
+0200
@@ -11,21 +11,22 @@
url = 'http://github.com/ojii/django-classy-tags',
packages = find_packages(),
zip_safe=False,
- install_requires=[
- 'Django>1.3',
- ],
+ install_requires=['Django>=1.11'],
test_suite='runtests.main',
classifiers=[
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: BSD License",
"Framework :: Django",
+ 'Framework :: Django :: 1.11',
+ 'Framework :: Django :: 2.0',
+ 'Framework :: Django :: 2.1',
"Intended Audience :: Developers",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
"Topic :: Utilities",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Python Modules",
