commit python-django-classy-tags for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-django-classy-tags for openSUSE:Factory checked in at 2021-06-01 10:35:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-classy-tags (Old) and /work/SRC/openSUSE:Factory/.python-django-classy-tags.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-classy-tags" Tue Jun 1 10:35:05 2021 rev:4 rq:895355 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-classy-tags/python-django-classy-tags.changes 2020-02-20 14:58:15.598627078 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-classy-tags.new.1898/python-django-classy-tags.changes 2021-06-01 10:35:32.096616221 +0200 @@ -1,0 +2,15 @@ +Tue May 25 10:27:38 UTC 2021 - Mark��ta Machov�� <mmachova@suse.com> + +- Do not package tests + +------------------------------------------------------------------- +Thu May 20 07:48:36 UTC 2021 - pgajdos@suse.com + +- version update to 2.0.0 + * Added support for Django 3.1 + * Dropped support for Python 2.7 and Python 3.4 + * Dropped support for Django < 2.2 + * Replaced pep8 with flake8 +- do not use deprecated setup.py test + +------------------------------------------------------------------- Old: ---- 1.0.0.tar.gz New: ---- 2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-classy-tags.spec ++++++ --- /var/tmp/diff_new_pack.orAd7X/_old 2021-06-01 10:35:32.572617031 +0200 +++ /var/tmp/diff_new_pack.orAd7X/_new 2021-06-01 10:35:32.576617038 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-django-classy-tags # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-django-classy-tags -Version: 1.0.0 +Version: 2.0.0 Release: 0 Summary: Class based template tags for Django License: MIT @@ -45,13 +45,16 @@ %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_expand rm -r %{buildroot}%{$python_sitelib}/tests %check -%python_exec setup.py test +export PYTHONPATH='.' +%python_exec tests/settings.py %files %{python_files} %doc README.rst %license LICENSE.txt -%{python_sitelib}/* +%{python_sitelib}/classytags +%{python_sitelib}/django_classy_tags*egg-info %changelog ++++++ 1.0.0.tar.gz -> 2.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/.travis.yml new/django-classy-tags-2.0.0/.travis.yml --- old/django-classy-tags-1.0.0/.travis.yml 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/.travis.yml 2020-08-26 11:20:50.000000000 +0200 @@ -1,7 +1,6 @@ language: python dist: xenial -sudo: false matrix: include: @@ -9,37 +8,24 @@ env: TOX_ENV='flake8' - python: 3.5 env: TOX_ENV='isort' - # Django 1.11 - - python: 2.7 - env: DJANGO='dj111' - - python: 3.4 - env: DJANGO='dj111' + # Django 2.2, run all supported versions for LTS releases - python: 3.5 - env: DJANGO='dj111' - - python: 3.6 - env: DJANGO='dj111' - # Django 2.1 - - python: 3.6 - env: DJANGO='dj21' - # Django 2.2 + env: DJANGO='dj22' - python: 3.6 env: DJANGO='dj22' - python: 3.7 env: DJANGO='dj22' - python: 3.8 env: DJANGO='dj22' - # Django 3.0 + # Django 3.0, always run the lowest supported version - python: 3.6 env: DJANGO='dj30' - - python: 3.7 - env: DJANGO='dj30' - - python: 3.8 - env: DJANGO='dj30' + # Django 3.1, always run the lowest supported version + - python: 3.6 + env: DJANGO='dj31' install: - - pip install coverage isort tox pep8 - - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi" - - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi" + - pip install coverage isort tox - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi" - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/CHANGELOG.rst new/django-classy-tags-2.0.0/CHANGELOG.rst --- old/django-classy-tags-1.0.0/CHANGELOG.rst 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/CHANGELOG.rst 2020-08-26 11:20:50.000000000 +0200 @@ -3,6 +3,15 @@ ========= +2.0.0 (2020-08-26) +================== + +* Added support for Django 3.1 +* Dropped support for Python 2.7 and Python 3.4 +* Dropped support for Django < 2.2 +* Replaced pep8 with flake8 + + 1.0.0 (2020-01-22) ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/README.rst new/django-classy-tags-2.0.0/README.rst --- old/django-classy-tags-1.0.0/README.rst 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/README.rst 2020-08-26 11:20:50.000000000 +0200 @@ -96,7 +96,7 @@ .. |coverage| image:: https://codecov.io/gh/divio/django-classy-tags/branch/master/graph/badge.svg :target: https://codecov.io/gh/divio/django-classy-tags -.. |python| image:: https://img.shields.io/badge/python-2.7%20%7C%203.4+-blue.svg +.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg :target: https://pypi.org/project/django-classy-tags/ -.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.2%20%7C%203.0-blue.svg +.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg :target: https://www.djangoproject.com/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/__init__.py new/django-classy-tags-2.0.0/classytags/__init__.py --- old/django-classy-tags-1.0.0/classytags/__init__.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/__init__.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- -__version__ = '1.0.0' +__version__ = '2.0.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/arguments.py new/django-classy-tags-2.0.0/classytags/arguments.py --- old/django-classy-tags-1.0.0/classytags/arguments.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/arguments.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django import template from django.core.exceptions import ImproperlyConfigured @@ -10,7 +9,7 @@ ) -class Argument(object): +class Argument: """ A basic single value argument. """ @@ -61,7 +60,7 @@ def __init__(self, name, default=None, required=True, resolve=True, defaultkey=None, splitter='='): - super(KeywordArgument, self).__init__(name, default, required, resolve) + super().__init__(name, default, required, resolve) self.defaultkey = defaultkey self.splitter = splitter @@ -76,10 +75,10 @@ def parse_token(self, parser, token): if self.splitter in token: key, raw_value = token.split(self.splitter, 1) - value = super(KeywordArgument, self).parse_token(parser, raw_value) + value = super().parse_token(parser, raw_value) else: key = self.defaultkey - value = super(KeywordArgument, self).parse_token(parser, token) + value = super().parse_token(parser, token) return key, self.value_class(value) def parse(self, parser, token, tagname, kwargs): @@ -107,7 +106,7 @@ def __init__(self, name, choices, default=None, required=True, resolve=True): - super(ChoiceArgument, self).__init__(name, default, required, resolve) + super().__init__(name, default, required, resolve) if default or not required: value_on_error = default else: @@ -136,8 +135,7 @@ default = [] else: required = False - super(MultiValueArgument, self).__init__(name, default, required, - resolve) + super().__init__(name, default, required, resolve) def parse(self, parser, token, tagname, kwargs): """ @@ -160,8 +158,7 @@ default = {} else: default = dict(default) - super(MultiKeywordArgument, self).__init__(name, default, required, - resolve, NULL, splitter) + super().__init__(name, default, required, resolve, NULL, splitter) self.max_values = max_values def get_default(self): @@ -197,7 +194,7 @@ required = False else: required = True - super(Flag, self).__init__(name, default, required) + super().__init__(name, default, required) if true_values is None: true_values = [] if false_values is None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/blocks.py new/django-classy-tags-2.0.0/classytags/blocks.py --- old/django-classy-tags-1.0.0/classytags/blocks.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/blocks.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.core.exceptions import ImproperlyConfigured @@ -9,7 +8,7 @@ return name -class BlockDefinition(object): +class BlockDefinition: """ Definition of 'parse-until-blocks' used by the parser. """ @@ -27,7 +26,7 @@ return [_collect(name, parser) for name in self.names] -class VariableBlockName(object): +class VariableBlockName: def __init__(self, template, argname): self.template = template self.argname = argname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/core.py new/django-classy-tags-2.0.0/classytags/core.py --- old/django-classy-tags-1.0.0/classytags/core.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/core.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,16 +1,13 @@ -# -*- coding: utf-8 -*- from operator import attrgetter from django.template import Node -import six - from classytags.blocks import BlockDefinition from classytags.parser import Parser from classytags.utils import StructuredOptions, get_default_name -class Options(object): +class Options: """ Option class holding the arguments of a tag. """ @@ -26,8 +23,8 @@ self.options[current_breakpoint] = [] self.all_argument_names = [] for value in options: - if isinstance(value, six.string_types): - if isinstance(last, six.string_types): + if isinstance(value, str): + if isinstance(last, str): self.combined_breakpoints[last] = value self.breakpoints.append(value) current_breakpoint = value @@ -40,7 +37,7 @@ for block in kwargs.get('blocks', []): if isinstance(block, BlockDefinition): block_definition = block - elif isinstance(block, six.string_types): + elif isinstance(block, str): block_definition = BlockDefinition(block, block) else: block_definition = BlockDefinition(block[1], block[0]) @@ -117,7 +114,7 @@ def __new__(cls, name, bases, attrs): parents = [base for base in bases if isinstance(base, TagMeta)] if not parents: - return super(TagMeta, cls).__new__(cls, name, bases, attrs) + return super().__new__(cls, name, bases, attrs) tag_name = str(attrs.get('name', get_default_name(name))) def fake_func(): @@ -126,7 +123,7 @@ fake_func.__name__ = tag_name attrs['_decorated_function'] = fake_func attrs['name'] = str(tag_name) - return super(TagMeta, cls).__new__(cls, name, bases, attrs) + return super().__new__(cls, name, bases, attrs) class Tag(TagMeta('TagMeta', (Node,), {})): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/exceptions.py new/django-classy-tags-2.0.0/classytags/exceptions.py --- old/django-classy-tags-1.0.0/classytags/exceptions.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/exceptions.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.template import TemplateSyntaxError diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/helpers.py new/django-classy-tags-2.0.0/classytags/helpers.py --- old/django-classy-tags-1.0.0/classytags/helpers.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/helpers.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.core.exceptions import ImproperlyConfigured from django.template.loader import render_to_string @@ -12,7 +11,7 @@ options must be added 'manually' to the options class. """ def __init__(self, parser, tokens): - super(AsTag, self).__init__(parser, tokens) + super().__init__(parser, tokens) if len(self.options.breakpoints) < 1: raise ImproperlyConfigured( "AsTag subclasses require at least one breakpoint." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/parser.py new/django-classy-tags-2.0.0/classytags/parser.py --- old/django-classy-tags-1.0.0/classytags/parser.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/parser.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from copy import deepcopy from django import template @@ -9,7 +8,7 @@ ) -class Parser(object): +class Parser: """ Argument parsing class. A new instance of this gets created each time a tag get's parsed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/utils.py new/django-classy-tags-2.0.0/classytags/utils.py --- old/django-classy-tags-1.0.0/classytags/utils.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/utils.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,12 +1,9 @@ -# -*- coding: utf-8 -*- import re from copy import copy from django.template import Context, RequestContext from django.template.context import BaseContext -import six - class NULL: """ @@ -14,14 +11,14 @@ """ -class TemplateConstant(object): +class TemplateConstant: """ A 'constant' internal template variable which basically allows 'resolving' returning it's initial value """ def __init__(self, value): self.literal = value - if isinstance(value, six.string_types): + if isinstance(value, str): self.value = value.strip('"\'') else: self.value = value @@ -33,7 +30,7 @@ return self.value -class StructuredOptions(object): +class StructuredOptions: """ Bootstrapped options """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/classytags/values.py new/django-classy-tags-2.0.0/classytags/values.py --- old/django-classy-tags-1.0.0/classytags/values.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/classytags/values.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,15 +1,12 @@ -# -*- coding: utf-8 -*- import warnings from django import template from django.conf import settings -import six - from classytags.exceptions import TemplateSyntaxWarning -class StringValue(object): +class StringValue: errors = {} value_on_error = "" @@ -50,7 +47,7 @@ value_on_error = "" def clean(self, value): - if not isinstance(value, six.string_types): + if not isinstance(value, str): return self.error(value, "clean") return value @@ -100,13 +97,13 @@ choices = [] def clean(self, value): - cleaned = super(ChoiceValue, self).clean(value) + cleaned = super().clean(value) if cleaned in self.choices: return cleaned else: return self.error(cleaned, "choice") def get_extra_error_data(self): - data = super(ChoiceValue, self).get_extra_error_data() + data = super().get_extra_error_data() data['choices'] = self.choices return data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/docs/conf.py new/django-classy-tags-2.0.0/docs/conf.py --- old/django-classy-tags-1.0.0/docs/conf.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/docs/conf.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # django-classy-tags documentation build configuration file, created by # sphinx-quickstart on Mon Aug 9 21:31:48 2010. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/docs/extend.rst new/django-classy-tags-2.0.0/docs/extend.rst --- old/django-classy-tags-1.0.0/docs/extend.rst 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/docs/extend.rst 2020-08-26 11:20:50.000000000 +0200 @@ -43,7 +43,7 @@ else: kwargs[self.name] = self.parse_token(parser, token) return True - + First it checks if the name is already in *kwargs*. If so, return ``False`` and let the next argument handle this token. Otherwise do some checking if we should resolve this token or not and add it to *kwargs*. Finally return ``True``. @@ -77,15 +77,15 @@ ********************** The argument parser was written with extensibility in mind. All important steps -are split into individual methods which can be overwritten. For information +are split into individual methods which can be overwritten. For information about those methods, please refer to the reference about :class:`classytags.parser.Parser`. -To use a custom parser, provide it as the ``parser_class`` keyword argument to +To use a custom parser, provide it as the ``parser_class`` keyword argument to :class:`classytags.core.Options`. .. note:: - + Each time your tag gets parsed, a new instance of the parser class gets created. This makes it safe to use ``self``. @@ -101,20 +101,20 @@ from django.template.loader import get_template - class TemplateResolver(object): + class TemplateResolver: def __init__(self, real): self.real = real - + def resolve(self, context): value = self.real.resolve(context) return get_template(value) - - + + Now for the real argument:: from classytags.arguments import Argument - + class TemplateArgument(Argument): def parse_token(self, parser, token): - real = super(TemplateArgument, self).parse_token(parser, token) + real = super().parse_token(parser, token) return TemplateResolver(real) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/setup.py new/django-classy-tags-2.0.0/setup.py --- old/django-classy-tags-1.0.0/setup.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/setup.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,13 +1,11 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- from setuptools import find_packages, setup from classytags import __version__ REQUIREMENTS = [ - 'django>=1.11', - 'six' + 'django>=2.2', ] @@ -18,19 +16,15 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Framework :: Django', - 'Framework :: Django :: 1.11', - 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', @@ -47,7 +41,7 @@ license='BSD', description='Class based template tags for Django', long_description=open('README.rst').read(), - packages=find_packages(exclude=['tests']), + packages=find_packages(), include_package_data=True, zip_safe=False, install_requires=REQUIREMENTS, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tests/__init__.py new/django-classy-tags-2.0.0/tests/__init__.py --- old/django-classy-tags-1.0.0/tests/__init__.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tests/__init__.py 2020-08-26 11:20:50.000000000 +0200 @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tests/context_managers.py new/django-classy-tags-2.0.0/tests/context_managers.py --- old/django-classy-tags-1.0.0/tests/context_managers.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tests/context_managers.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django import template from django.conf import settings from django.template.engine import Engine @@ -11,7 +10,7 @@ pass -class SettingsOverride(object): # pragma: no cover +class SettingsOverride: # pragma: no cover """ Overrides Django settings within a context and resets them to their inital values on exit. @@ -38,7 +37,7 @@ delattr(settings, key) # do not pollute the context! -class TemplateTags(object): # pragma: no cover +class TemplateTags: # pragma: no cover def __init__(self, *tags): self.lib = template.Library() for tag in tags: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tests/requirements.txt new/django-classy-tags-2.0.0/tests/requirements.txt --- old/django-classy-tags-1.0.0/tests/requirements.txt 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tests/requirements.txt 2020-08-26 11:20:50.000000000 +0200 @@ -1,3 +1,4 @@ # other requirements tox coverage +flake8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tests/settings.py new/django-classy-tags-2.0.0/tests/settings.py --- old/django-classy-tags-1.0.0/tests/settings.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tests/settings.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tests/test_core.py new/django-classy-tags-2.0.0/tests/test_core.py --- old/django-classy-tags-1.0.0/tests/test_core.py 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tests/test_core.py 2020-08-26 11:20:50.000000000 +0200 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import operator import os import sys @@ -10,7 +9,6 @@ from django.template import Context, RequestContext from django.test import RequestFactory -import six from tests.context_managers import SettingsOverride, TemplateTags from classytags import ( @@ -24,13 +22,13 @@ class DummyTokens(list): def __init__(self, *tokens): - super(DummyTokens, self).__init__(['dummy_tag'] + list(tokens)) + super().__init__(['dummy_tag'] + list(tokens)) def split_contents(self): return self -class DummyParser(object): +class DummyParser: @staticmethod def compile_filter(token): return utils.TemplateConstant(token) @@ -39,7 +37,7 @@ dummy_parser = DummyParser() -class _Warning(object): +class _Warning: def __init__(self, message, category, filename, lineno): self.message = message self.category = category @@ -527,7 +525,7 @@ if self not in context.render_context: context.render_context[self] = itertools_cycle(values) cycle_iter = context.render_context[self] - value = six.next(cycle_iter) + value = next(cycle_iter) if varname: context[varname] = value return value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/django-classy-tags-1.0.0/tox.ini new/django-classy-tags-2.0.0/tox.ini --- old/django-classy-tags-1.0.0/tox.ini 2020-01-22 10:12:15.000000000 +0100 +++ new/django-classy-tags-2.0.0/tox.ini 2020-08-26 11:20:50.000000000 +0200 @@ -2,9 +2,8 @@ envlist = flake8 isort - py{27,34,35,36}-dj{111} - py{35,36,37}-dj{21,22} - py{36,37}-dj30 + py{35,36,37,38}-dj{22} + py{36,37,38}-dj{30,31} skip_missing_interpreters=True @@ -39,10 +38,9 @@ [testenv] deps = -r{toxinidir}/tests/requirements.txt - dj111: Django>=1.11,<2.0 - dj21: Django>=2.1,<2.2 dj22: Django>=2.2,<3.0 dj30: Django>=3.0,<3.1 + dj31: Django>=3.1,<3.2 commands = {envpython} --version {env:COMMAND:coverage} erase
participants (1)
-
Source-Sync