Hello community,
here is the log from the commit of package python-django-sekizai for
openSUSE:Factory checked in at 2020-09-12 00:11:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-sekizai (Old)
and /work/SRC/openSUSE:Factory/.python-django-sekizai.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-sekizai"
Sat Sep 12 00:11:30 2020 rev:4 rq:833763 version:2.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-sekizai/python-django-sekizai.changes
2020-02-20 14:59:39.814792323 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-sekizai.new.4249/python-django-sekizai.changes
2020-09-12 00:12:10.133194408 +0200
@@ -1,0 +2,11 @@
+Fri Sep 11 11:34:31 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- 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
+ * Adapted documentation
+- Drop django-sekizai-pycodestyle.patch
+
+-------------------------------------------------------------------
Old:
----
1.1.0.tar.gz
django-sekizai-pycodestyle.patch
New:
----
2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-sekizai.spec ++++++
--- /var/tmp/diff_new_pack.mQXPYh/_old 2020-09-12 00:12:12.789196950 +0200
+++ /var/tmp/diff_new_pack.mQXPYh/_new 2020-09-12 00:12:12.793196953 +0200
@@ -17,14 +17,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-django-sekizai
-Version: 1.1.0
+Version: 2.0.0
Release: 0
Summary: Django Template Blocks with extra functionality
License: MIT
URL: https://github.com/ojii/django-sekizai
Source:
https://github.com/divio/django-sekizai/archive/%{version}.tar.gz
-Patch0: django-sekizai-pycodestyle.patch
BuildRequires: %{python_module Django >= 1.11}
BuildRequires: %{python_module django-classy-tags >= 0.3.1}
BuildRequires: %{python_module pycodestyle}
@@ -41,7 +41,6 @@
%prep
%setup -q -n django-sekizai-%{version}
-%autopatch -p1
%build
%python_build
++++++ 1.1.0.tar.gz -> 2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/.travis.yml
new/django-sekizai-2.0.0/.travis.yml
--- old/django-sekizai-1.1.0/.travis.yml 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/.travis.yml 2020-08-26 11:20:48.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-sekizai-1.1.0/CHANGELOG.rst
new/django-sekizai-2.0.0/CHANGELOG.rst
--- old/django-sekizai-1.1.0/CHANGELOG.rst 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/CHANGELOG.rst 2020-08-26 11:20:48.000000000
+0200
@@ -3,6 +3,16 @@
=========
+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
+* Adapted documentation
+
+
1.1.0 (2020-01-22)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/README.rst
new/django-sekizai-2.0.0/README.rst
--- old/django-sekizai-1.1.0/README.rst 2020-01-22 10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/README.rst 2020-08-26 11:20:48.000000000 +0200
@@ -60,7 +60,7 @@
.. |coverage| image::
https://codecov.io/gh/divio/django-sekizai/branch/master/graph/badge.svg
:target: https://codecov.io/gh/divio/django-sekizai
-.. |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-sekizai/
-.. |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-sekizai-1.1.0/docs/conf.py
new/django-sekizai-2.0.0/docs/conf.py
--- old/django-sekizai-1.1.0/docs/conf.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/docs/conf.py 2020-08-26 11:20:48.000000000
+0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# django-sekizai documentation build configuration file, created by
# sphinx-quickstart on Tue Jun 29 23:12:20 2010.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/docs/index.rst
new/django-sekizai-2.0.0/docs/index.rst
--- old/django-sekizai-1.1.0/docs/index.rst 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/docs/index.rst 2020-08-26 11:20:48.000000000
+0200
@@ -27,13 +27,6 @@
sekizai will ignore any duplicate content in a single block.
-************
-Dependencies
-************
-
-* Django 1.11, 2.0, 2.1, or 2.2.
-* django-classy-tags 0.3.1 or higher.
-
*****
Usage
*****
@@ -45,14 +38,9 @@
steps:
* Put 'sekizai' into your ``INSTALLED_APPS`` setting.
-* Use one of the following:
- * Add ``sekizai.context_processors.sekizai`` to your
- ``TEMPLATES['OPTIONS']['context_processors']`` setting and use
- ``django.template.RequestContext`` when rendering your templates.
-
- or
-
- * Use ``sekizai.context.SekizaiContext`` when rendering your templates.
+* Add ``sekizai.context_processors.sekizai`` to your
+ ``TEMPLATES['OPTIONS']['context_processors']`` setting and use
+ ``django.template.RequestContext`` when rendering your templates.
Template Tag Reference
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/__init__.py
new/django-sekizai-2.0.0/sekizai/__init__.py
--- old/django-sekizai-1.1.0/sekizai/__init__.py 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/__init__.py 2020-08-26
11:20:48.000000000 +0200
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__version__ = '1.1.0'
+__version__ = '2.0.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/context.py
new/django-sekizai-2.0.0/sekizai/context.py
--- old/django-sekizai-1.1.0/sekizai/context.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/sekizai/context.py 2020-08-26 11:20:48.000000000
+0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from django.template import Context
from sekizai.context_processors import sekizai
@@ -10,5 +9,5 @@
no request is available.
"""
def __init__(self, *args, **kwargs):
- super(SekizaiContext, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.update(sekizai())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/context_processors.py
new/django-sekizai-2.0.0/sekizai/context_processors.py
--- old/django-sekizai-1.1.0/sekizai/context_processors.py 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/context_processors.py 2020-08-26
11:20:48.000000000 +0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from collections import defaultdict
from sekizai.data import UniqueSequence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/context_processors.pyi
new/django-sekizai-2.0.0/sekizai/context_processors.pyi
--- old/django-sekizai-1.1.0/sekizai/context_processors.pyi 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/context_processors.pyi 2020-08-26
11:20:48.000000000 +0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from typing import Dict, Union
from django.http import HttpRequest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/data.py
new/django-sekizai-2.0.0/sekizai/data.py
--- old/django-sekizai-1.1.0/sekizai/data.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/sekizai/data.py 2020-08-26 11:20:48.000000000
+0200
@@ -1,8 +1,4 @@
-# -*- coding: utf-8 -*-
-try:
- from collections.abc import MutableSequence
-except ImportError: # Python 2
- from collections import MutableSequence
+from collections.abc import MutableSequence
class UniqueSequence(MutableSequence):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/helpers.py
new/django-sekizai-2.0.0/sekizai/helpers.py
--- old/django-sekizai-1.1.0/sekizai/helpers.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/sekizai/helpers.py 2020-08-26 11:20:48.000000000
+0200
@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
from django.conf import settings
-from django.template.base import Context, Template, Variable, VariableNode
+from django.template.base import Template, Variable, VariableNode
+from django.template.context import Context
from django.template.loader import get_template
from django.template.loader_tags import BlockNode, ExtendsNode
@@ -133,7 +133,7 @@
return getattr(settings, 'SEKIZAI_VARNAME', 'SEKIZAI_CONTENT_HOLDER')
-class Watcher(object):
+class Watcher:
"""
Watches a context for changes to the sekizai data, so it can be replayed
later. This is useful for caching.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/helpers.pyi
new/django-sekizai-2.0.0/sekizai/helpers.pyi
--- old/django-sekizai-1.1.0/sekizai/helpers.pyi 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/helpers.pyi 2020-08-26
11:20:48.000000000 +0200
@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
from typing import Dict, List, Union
-from django.template.base import Context, Node, NodeList, Template
+from django.template.base import Node, NodeList, Template
+from django.template.context import Context
def _get_nodelist(tpl: Template) -> NodeList: ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/sekizai/models.py
new/django-sekizai-2.0.0/sekizai/models.py
--- old/django-sekizai-1.1.0/sekizai/models.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/sekizai/models.py 2020-08-26 11:20:48.000000000
+0200
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-1.1.0/sekizai/templatetags/__init__.py
new/django-sekizai-2.0.0/sekizai/templatetags/__init__.py
--- old/django-sekizai-1.1.0/sekizai/templatetags/__init__.py 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/templatetags/__init__.py 2020-08-26
11:20:48.000000000 +0200
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-1.1.0/sekizai/templatetags/sekizai_tags.py
new/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.py
--- old/django-sekizai-1.1.0/sekizai/templatetags/sekizai_tags.py
2020-01-22 10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.py
2020-08-26 11:20:48.000000000 +0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from importlib import import_module
from django import template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-1.1.0/sekizai/templatetags/sekizai_tags.pyi
new/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.pyi
--- old/django-sekizai-1.1.0/sekizai/templatetags/sekizai_tags.pyi
2020-01-22 10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.pyi
2020-08-26 11:20:48.000000000 +0200
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from types import ModuleType
from django.template import Context
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/setup.py
new/django-sekizai-2.0.0/setup.py
--- old/django-sekizai-1.1.0/setup.py 2020-01-22 10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/setup.py 2020-08-26 11:20:48.000000000 +0200
@@ -1,14 +1,12 @@
#!/usr/bin/env python
-# -*- coding: utf-8 -*-
from setuptools import find_packages, setup
from sekizai import __version__
REQUIREMENTS = [
- 'django>=1.11',
- 'django-classy-tags>=0.9.0',
- 'six',
+ 'django>=2.2',
+ 'django-classy-tags>=1',
]
@@ -19,19 +17,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',
@@ -45,10 +39,10 @@
author='Jonas Obrist',
author_email='[email protected]',
url='http://github.com/ojii/django-sekizai',
- license='BSD',
+ license='BSD-3-Clause',
description='Django Sekizai',
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-sekizai-1.1.0/tests/__init__.py
new/django-sekizai-2.0.0/tests/__init__.py
--- old/django-sekizai-1.1.0/tests/__init__.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/tests/__init__.py 2020-08-26 11:20:48.000000000
+0200
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/tests/requirements.txt
new/django-sekizai-2.0.0/tests/requirements.txt
--- old/django-sekizai-1.1.0/tests/requirements.txt 2020-01-22
10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/tests/requirements.txt 2020-08-26
11:20:48.000000000 +0200
@@ -1,4 +1,4 @@
# other requirements
tox
coverage
-pep8
+flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/tests/settings.py
new/django-sekizai-2.0.0/tests/settings.py
--- old/django-sekizai-1.1.0/tests/settings.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/tests/settings.py 2020-08-26 11:20:48.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-sekizai-1.1.0/tests/test_core.py
new/django-sekizai-2.0.0/tests/test_core.py
--- old/django-sekizai-1.1.0/tests/test_core.py 2020-01-22 10:39:39.000000000
+0100
+++ new/django-sekizai-2.0.0/tests/test_core.py 2020-08-26 11:20:48.000000000
+0200
@@ -1,6 +1,6 @@
-import os
import sys
from difflib import SequenceMatcher
+from io import StringIO
from unittest import TestCase
from django import template
@@ -8,8 +8,6 @@
from django.template.engine import Engine
from django.template.loader import render_to_string
-import pep8
-
from sekizai import context_processors
from sekizai.context import SekizaiContext
from sekizai.helpers import (
@@ -20,17 +18,6 @@
)
-try:
- unicode_compat = unicode
-except NameError:
- unicode_compat = str
-
-try:
- from io import StringIO
-except ImportError:
- from StringIO import StringIO
-
-
def null_processor(context, data, namespace):
return ''
@@ -39,7 +26,7 @@
return namespace
-class SettingsOverride(object):
+class SettingsOverride:
"""
Overrides Django settings within a context and resets them to their initial
values on exit.
@@ -69,7 +56,7 @@
setattr(settings, key, value)
-class CaptureStdout(object):
+class CaptureStdout:
"""
Overrides sys.stdout with a StringIO stream.
"""
@@ -105,24 +92,24 @@
return thing
-class BitDiffResult(object):
+class BitDiffResult:
def __init__(self, status, message):
self.status = status
self.message = message
-class BitDiff(object):
+class BitDiff:
"""
Visual aid for failing tests
"""
def __init__(self, expected):
- self.expected = [repr(unicode_compat(bit)) for bit in expected]
+ self.expected = [repr(str(bit)) for bit in expected]
def test(self, result):
- result = [repr(unicode_compat(bit)) for bit in result]
+ result = [repr(str(bit)) for bit in result]
if self.expected == result:
return BitDiffResult(True, "success")
else: # pragma: no cover
@@ -212,17 +199,6 @@
self.assertTrue(result.status, result.message)
return rendered
- def test_pep8(self):
- sekizai_dir = os.path.dirname(os.path.abspath(__file__))
- pep8style = pep8.StyleGuide()
- with CaptureStdout() as stdout:
- result = pep8style.check_files([sekizai_dir])
- errors = stdout.getvalue()
- self.assertEqual(
- result.total_errors, 0,
- "Code not PEP8 compliant:\n{0}".format(errors)
- )
-
def test_basic_dual_block(self):
"""
Basic dual block testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-1.1.0/tox.ini
new/django-sekizai-2.0.0/tox.ini
--- old/django-sekizai-1.1.0/tox.ini 2020-01-22 10:39:39.000000000 +0100
+++ new/django-sekizai-2.0.0/tox.ini 2020-08-26 11:20:48.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
