Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-sekizai for
openSUSE:Factory checked in at 2023-06-22 23:26:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-sekizai (Old)
and /work/SRC/openSUSE:Factory/.python-django-sekizai.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-sekizai"
Thu Jun 22 23:26:59 2023 rev:7 rq:1094658 version:4.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-sekizai/python-django-sekizai.changes
2021-06-01 10:36:24.668705728 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-sekizai.new.15902/python-django-sekizai.changes
2023-06-22 23:27:40.762336766 +0200
@@ -1,0 +2,7 @@
+Wed Jun 21 10:50:33 UTC 2023 - Andreas Schneider <[email protected]>
+
+- Update to 4.1.0
+ * https://github.com/django-cms/django-sekizai/releases
+- Use sle15_python_module_pythons
+
+-------------------------------------------------------------------
Old:
----
2.0.0.tar.gz
New:
----
4.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-sekizai.spec ++++++
--- /var/tmp/diff_new_pack.fcbdIV/_old 2023-06-22 23:27:41.330339663 +0200
+++ /var/tmp/diff_new_pack.fcbdIV/_new 2023-06-22 23:27:41.334339683 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django-sekizai
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,9 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
+%{?sle15_python_module_pythons}
Name: python-django-sekizai
-Version: 2.0.0
+Version: 4.1.0
Release: 0
Summary: Django Template Blocks with extra functionality
License: MIT
@@ -47,7 +46,6 @@
%install
%python_install
-%python_expand rm -r %{buildroot}%{$python_sitelib}/tests
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
@@ -55,7 +53,7 @@
%python_exec tests/settings.py
%files %{python_files}
-%license LICENSE.txt
+%license LICENSE
%doc README.rst
%{python_sitelib}/*
++++++ 2.0.0.tar.gz -> 4.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-2.0.0/.github/workflows/codeql-analysis.yml
new/django-sekizai-4.1.0/.github/workflows/codeql-analysis.yml
--- old/django-sekizai-2.0.0/.github/workflows/codeql-analysis.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/codeql-analysis.yml
2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,47 @@
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ master ]
+ schedule:
+ - cron: '41 7 * * 5'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'python' ]
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
+
+ # â¹ï¸ Command-line programs to run using the OS shell.
+ # ð https://git.io/JvXDl
+
+ # âï¸ If the Autobuild fails above, remove it and uncomment the
following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ #- run: |
+ # make bootstrap
+ # make release
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.github/workflows/docs.yml
new/django-sekizai-4.1.0/.github/workflows/docs.yml
--- old/django-sekizai-2.0.0/.github/workflows/docs.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/docs.yml 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,20 @@
+name: Docs
+
+on: [push, pull_request]
+
+jobs:
+ docs:
+ runs-on: ubuntu-latest
+ name: docs
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: 3.9
+ - run: python -m pip install -r docs/requirements.txt
+ - name: Build docs
+ run: |
+ cd docs
+ sphinx-build -b dirhtml -n -d build/doctrees . build/dirhtml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.github/workflows/lint.yml
new/django-sekizai-4.1.0/.github/workflows/lint.yml
--- old/django-sekizai-2.0.0/.github/workflows/lint.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/lint.yml 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,38 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+ flake8:
+ name: flake8
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: 3.9
+ - name: Install flake8
+ run: pip install --upgrade flake8
+ - name: Run flake8
+ uses: liskin/gh-problem-matcher-wrap@v1
+ with:
+ linters: flake8
+ run: flake8
+
+ isort:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: 3.9
+ - run: python -m pip install isort
+ - name: isort
+ uses: liskin/gh-problem-matcher-wrap@v1
+ with:
+ linters: isort
+ run: isort --check --diff sekizai
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-2.0.0/.github/workflows/publish-to-live-pypi.yml
new/django-sekizai-4.1.0/.github/workflows/publish-to-live-pypi.yml
--- old/django-sekizai-2.0.0/.github/workflows/publish-to-live-pypi.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/publish-to-live-pypi.yml
2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,39 @@
+name: Publish ð ð¦ to pypi
+
+on:
+ release:
+ types:
+ - published
+
+jobs:
+ build-n-publish:
+ name: Build and publish ð ð¦ to pypi
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: Set up Python 3.9
+ uses: actions/setup-python@v4
+ with:
+ python-version: 3.9
+
+ - name: Install pypa/build
+ run: >-
+ python -m
+ pip install
+ build
+ --user
+ - name: Build a binary wheel and a source tarball
+ run: >-
+ python -m
+ build
+ --sdist
+ --wheel
+ --outdir dist/
+ .
+
+ - name: Publish ð¦ to PyPI
+ if: startsWith(github.ref, 'refs/tags')
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ user: __token__
+ password: ${{ secrets.PYPI_API_TOKEN }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-2.0.0/.github/workflows/publish-to-test-pypi.yml
new/django-sekizai-4.1.0/.github/workflows/publish-to-test-pypi.yml
--- old/django-sekizai-2.0.0/.github/workflows/publish-to-test-pypi.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/publish-to-test-pypi.yml
2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,40 @@
+name: Publish ð ð¦ to TestPyPI
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ build-n-publish:
+ name: Build and publish ð ð¦ to TestPyPI
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@master
+ - name: Set up Python 3.9
+ uses: actions/setup-python@v4
+ with:
+ python-version: 3.9
+
+ - name: Install pypa/build
+ run: >-
+ python -m
+ pip install
+ build
+ --user
+ - name: Build a binary wheel and a source tarball
+ run: >-
+ python -m
+ build
+ --sdist
+ --wheel
+ --outdir dist/
+ .
+
+ - name: Publish ð¦ to Test PyPI
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ user: __token__
+ password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+ repository_url: https://test.pypi.org/legacy/
+ skip_existing: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.github/workflows/test.yml
new/django-sekizai-4.1.0/.github/workflows/test.yml
--- old/django-sekizai-2.0.0/.github/workflows/test.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.github/workflows/test.yml 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,67 @@
+name: CodeCov tests
+
+on: [push, pull_request]
+
+jobs:
+ unit-tests:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ['3.8', '3.9', '3.10']
+ django-version: ['3.2', '4.0', '4.1']
+ os: [
+ ubuntu-20.04,
+ ]
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install django==${{ matrix.django-version }} coverage
+ python setup.py install
+
+ - name: Run coverage
+ run: coverage run setup.py test
+
+ - name: Upload Coverage to Codecov
+ uses: codecov/codecov-action@v1
+
+ unit-tests-future-versions:
+ # Runs for all Django/Python versions which are not yet supported
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ['3.10', '3.11']
+ django-version: [
+ 'https://github.com/django/django/archive/main.tar.gz'
+ ]
+ os: [
+ ubuntu-20.04,
+ ]
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install ${{ matrix.django-version }} coverage
+ python setup.py install
+
+ - name: Run coverage
+ run: coverage run setup.py test
+ continue-on-error: true
+
+ - name: Upload Coverage to Codecov
+ uses: codecov/codecov-action@v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.gitignore
new/django-sekizai-4.1.0/.gitignore
--- old/django-sekizai-2.0.0/.gitignore 2020-08-26 11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/.gitignore 2023-05-02 17:35:32.000000000 +0200
@@ -4,7 +4,7 @@
*.log
*.pot
.DS_Store
-.coverage/
+.coverage
.eggs/
.idea/
.project/
@@ -16,5 +16,6 @@
build/
dist/
env/
+.venv/
local.sqlite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.pre-commit-config.yaml
new/django-sekizai-4.1.0/.pre-commit-config.yaml
--- old/django-sekizai-2.0.0/.pre-commit-config.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/.pre-commit-config.yaml 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,42 @@
+ci:
+ autofix_commit_msg: |
+ ci: auto fixes from pre-commit hooks
+
+ for more information, see https://pre-commit.ci
+ autofix_prs: false
+ autoupdate_commit_msg: 'ci: pre-commit autoupdate'
+ autoupdate_schedule: monthly
+
+repos:
+ - repo: https://github.com/asottile/pyupgrade
+ rev: v3.3.2
+ hooks:
+ - id: pyupgrade
+ args: ["--py38-plus"]
+
+ - repo: https://github.com/adamchainz/django-upgrade
+ rev: '1.13.0'
+ hooks:
+ - id: django-upgrade
+ args: [--target-version, "3.2"]
+
+ - repo: https://github.com/PyCQA/flake8
+ rev: 6.0.0
+ hooks:
+ - id: flake8
+
+ - repo: https://github.com/asottile/yesqa
+ rev: v1.4.0
+ hooks:
+ - id: yesqa
+
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.4.0
+ hooks:
+ - id: check-merge-conflict
+ - id: mixed-line-ending
+
+ - repo: https://github.com/pycqa/isort
+ rev: 5.12.0
+ hooks:
+ - id: isort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/.travis.yml
new/django-sekizai-4.1.0/.travis.yml
--- old/django-sekizai-2.0.0/.travis.yml 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/.travis.yml 1970-01-01 01:00:00.000000000
+0100
@@ -1,39 +0,0 @@
-language: python
-
-dist: xenial
-
-matrix:
- include:
- - python: 3.5
- env: TOX_ENV='flake8'
- - python: 3.5
- env: TOX_ENV='isort'
- # Django 2.2, run all supported versions for LTS releases
- - python: 3.5
- env: DJANGO='dj22'
- - python: 3.6
- env: DJANGO='dj22'
- - python: 3.7
- env: DJANGO='dj22'
- - python: 3.8
- env: DJANGO='dj22'
- # Django 3.0, always run the lowest supported version
- - python: 3.6
- env: DJANGO='dj30'
- # Django 3.1, always run the lowest supported version
- - python: 3.6
- env: DJANGO='dj31'
-
-install:
- - 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"
- - "if [[ $TRAVIS_PYTHON_VERSION == '3.8' ]]; then export PY_VER=py38; fi"
- - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER; fi"
-
-script:
- - tox -e $TOX_ENV
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/CHANGELOG.rst
new/django-sekizai-4.1.0/CHANGELOG.rst
--- old/django-sekizai-2.0.0/CHANGELOG.rst 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/CHANGELOG.rst 2023-05-02 17:35:32.000000000
+0200
@@ -2,6 +2,32 @@
Changelog
=========
+unreleased
+==========
+
+4.1.0 2023-05-02
+================
+
+* Added django 4.2 and main to the test suite
+* Fix bug which let checks fail on templates using
+ the with_data template tag.
+
+4.0.0 2022-07-26
+================
+
+* Django 4 support added
+* Dropped python 3.7, django 2.2 and 3.1
+
+3.0.1 2022-02-01
+================
+
+* Fix for tests in sdist tarball [#115]
+
+3.0.0 2022-01-22
+================
+
+* Added support for Django 3.2
+* Drop support for python 3.5 and 3.6
2.0.0 (2020-08-26)
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/LICENSE
new/django-sekizai-4.1.0/LICENSE
--- old/django-sekizai-2.0.0/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/LICENSE 2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,24 @@
+Copyright (c) 2010, Jonas Obrist
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Jonas Obrist nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL JONAS OBRIST BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/LICENSE.txt
new/django-sekizai-4.1.0/LICENSE.txt
--- old/django-sekizai-2.0.0/LICENSE.txt 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/LICENSE.txt 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-Copyright (c) 2010, Jonas Obrist
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Jonas Obrist nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL JONAS OBRIST BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/MANIFEST.in
new/django-sekizai-4.1.0/MANIFEST.in
--- old/django-sekizai-2.0.0/MANIFEST.in 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/MANIFEST.in 2023-05-02 17:35:32.000000000
+0200
@@ -1,3 +1,6 @@
-include LICENSE.txt
+include LICENSE
include README.rst
recursive-exclude * *.py[co]
+recursive-include tests *.html
+recursive-include tests *.py
+recursive-include tests *.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/README.rst
new/django-sekizai-4.1.0/README.rst
--- old/django-sekizai-2.0.0/README.rst 2020-08-26 11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/README.rst 2023-05-02 17:35:32.000000000 +0200
@@ -16,17 +16,29 @@
django template language works, but if used properly it can be very useful and
it is the media handling framework for the django CMS (since version 2.2).
+.. note::
+
+ This project is endorsed by the `django CMS Association
<https://www.django-cms.org/en/about-us/>`_.
+ That means that it is officially accepted by the dCA as being in line
with our roadmap vision and development/plugin policy.
+ Join us on `Slack <https://www.django-cms.org/slack/>`_.
+
+
+*******************************************
+Contribute to this project and win rewards
+*******************************************
+
+Because this is a an open-source project, we welcome everyone to
+`get involved in the project <https://www.django-cms.org/en/contribute/>`_ and
+`receive a reward <https://www.django-cms.org/en/bounty-program/>`_ for their
contribution.
+Become part of a fantastic community and help us make django CMS the best CMS
in the world.
-Contributing
-============
-
-This is a an open-source project. We'll be delighted to receive your
+We'll be delighted to receive your
feedback in the form of issues and pull requests. Before submitting your
pull request, please review our `contribution guidelines
<http://docs.django-cms.org/en/latest/contributing/index.html>`_.
We're grateful to all contributors who have helped create and maintain this
package.
-Contributors are listed at the `contributors
<https://github.com/divio/django-sekizai/graphs/contributors>`_
+Contributors are listed at the `contributors
<https://github.com/django-cms/django-sekizai/graphs/contributors>`_
section.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/docs/conf.py
new/django-sekizai-4.1.0/docs/conf.py
--- old/django-sekizai-2.0.0/docs/conf.py 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/docs/conf.py 2023-05-02 17:35:32.000000000
+0200
@@ -10,9 +10,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import os
-import sys
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -38,8 +35,8 @@
master_doc = 'index'
# General information about the project.
-project = u'django-sekizai'
-copyright = u'2010, Jonas Obrist'
+project = 'django-sekizai'
+copyright = '2010, Jonas Obrist'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -173,8 +170,8 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass
[howto/manual]).
latex_documents = [
- ('index', 'django-sekizai.tex', u'django-sekizai Documentation',
- u'Jonas Obrist', 'manual'),
+ ('index', 'django-sekizai.tex', 'django-sekizai Documentation',
+ 'Jonas Obrist', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/docs/index.rst
new/django-sekizai-4.1.0/docs/index.rst
--- old/django-sekizai-2.0.0/docs/index.rst 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/docs/index.rst 2023-05-02 17:35:32.000000000
+0200
@@ -70,6 +70,7 @@
<html>
<head>
+ {% block css %}{% endblock %}
{% render_block "css" %}
</head>
<body>
@@ -85,6 +86,7 @@
</script>
{% endaddtoblock %}
And even more content.
+ {% block js %}{% endblock %}
{% render_block "js" %}
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/docs/requirements.txt
new/django-sekizai-4.1.0/docs/requirements.txt
--- old/django-sekizai-2.0.0/docs/requirements.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/docs/requirements.txt 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,8 @@
+django<4.1
+MarkupSafe
+Pygments
+restructuredtext_lint
+sphinx
+sphinxcontrib-spelling
+sphinx-autobuild
+sphinxcontrib-inlinesyntaxhighlight
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/requirements.in
new/django-sekizai-4.1.0/requirements.in
--- old/django-sekizai-2.0.0/requirements.in 1970-01-01 01:00:00.000000000
+0100
+++ new/django-sekizai-4.1.0/requirements.in 2023-05-02 17:35:32.000000000
+0200
@@ -0,0 +1,6 @@
+bump2version
+Django>3.2
+django-classy-tags>=3.0
+pip-tools
+pre-commit
+wheel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/requirements.txt
new/django-sekizai-4.1.0/requirements.txt
--- old/django-sekizai-2.0.0/requirements.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/django-sekizai-4.1.0/requirements.txt 2023-05-02 17:35:32.000000000
+0200
@@ -0,0 +1,60 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+# pip-compile
+#
+asgiref==3.5.2
+ # via django
+build==0.8.0
+ # via pip-tools
+bump2version==1.0.1
+ # via -r requirements.in
+cfgv==3.3.1
+ # via pre-commit
+click==8.1.3
+ # via pip-tools
+distlib==0.3.5
+ # via virtualenv
+django==4.0.8
+ # via
+ # -r requirements.in
+ # django-classy-tags
+django-classy-tags==3.0.1
+ # via -r requirements.in
+filelock==3.7.1
+ # via virtualenv
+identify==2.5.2
+ # via pre-commit
+nodeenv==1.7.0
+ # via pre-commit
+packaging==21.3
+ # via build
+pep517==0.12.0
+ # via build
+pip-tools==6.8.0
+ # via -r requirements.in
+platformdirs==2.5.2
+ # via virtualenv
+pre-commit==2.20.0
+ # via -r requirements.in
+pyparsing==3.0.9
+ # via packaging
+pyyaml==6.0
+ # via pre-commit
+sqlparse==0.4.4
+ # via django
+toml==0.10.2
+ # via pre-commit
+tomli==2.0.1
+ # via pep517
+virtualenv==20.16.0
+ # via pre-commit
+wheel==0.38.1
+ # via
+ # -r requirements.in
+ # pip-tools
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/sekizai/__init__.py
new/django-sekizai-4.1.0/sekizai/__init__.py
--- old/django-sekizai-2.0.0/sekizai/__init__.py 2020-08-26
11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/sekizai/__init__.py 2023-05-02
17:35:32.000000000 +0200
@@ -1 +1 @@
-__version__ = '2.0.0'
+__version__ = '4.1.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/sekizai/helpers.py
new/django-sekizai-4.1.0/sekizai/helpers.py
--- old/django-sekizai-2.0.0/sekizai/helpers.py 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/sekizai/helpers.py 2023-05-02 17:35:32.000000000
+0200
@@ -87,12 +87,12 @@
def _scan_namespaces(nodelist, current_block=None):
- from sekizai.templatetags.sekizai_tags import RenderBlock
+ from sekizai.templatetags.sekizai_tags import RenderBlock, WithData
found = []
for node in nodelist:
# check if this is RenderBlock node
- if isinstance(node, RenderBlock):
+ if isinstance(node, (RenderBlock, WithData)):
# resolve it's name against a dummy context
found.append(node.kwargs['name'].resolve({}))
found += _scan_namespaces(node.blocks['nodelist'], node)
@@ -142,9 +142,9 @@
"""
def __init__(self, context):
self.context = context
- self.frozen = dict(
- (key, list(value)) for key, value in self.data.items()
- )
+ self.frozen = {
+ key: list(value) for key, value in self.data.items()
+ }
@property
def data(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.py
new/django-sekizai-4.1.0/sekizai/templatetags/sekizai_tags.py
--- old/django-sekizai-2.0.0/sekizai/templatetags/sekizai_tags.py
2020-08-26 11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/sekizai/templatetags/sekizai_tags.py
2023-05-02 17:35:32.000000000 +0200
@@ -51,7 +51,7 @@
class SekizaiParser(Parser):
def parse_blocks(self):
- super(SekizaiParser, self).parse_blocks()
+ super().parse_blocks()
self.blocks['nodelist'] = self.parser.parse()
@@ -67,7 +67,7 @@
class SekizaiTag(Tag):
def render(self, context):
if validate_context(context):
- return super(SekizaiTag, self).render(context)
+ return super().render(context)
return ''
@@ -90,7 +90,7 @@
if postprocessor:
func = import_processor(postprocessor)
data = func(context, data, name)
- return '%s\n%s' % (data, rendered_contents)
+ return f'{data}\n{rendered_contents}'
register.tag('render_block', RenderBlock)
@@ -134,7 +134,7 @@
context[variable] = data
inner_contents = inner_nodelist.render(context)
context.pop()
- return '%s\n%s' % (inner_contents, rendered_contents)
+ return f'{inner_contents}\n{rendered_contents}'
register.tag('with_data', WithData)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/setup.cfg
new/django-sekizai-4.1.0/setup.cfg
--- old/django-sekizai-2.0.0/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/setup.cfg 2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,52 @@
+[bumpversion]
+current_version = 4.1.0
+commit = True
+tag = False
+
+[bumpversion:file:setup.py]
+search = version='{current_version}'
+replace = version='{new_version}'
+
+[bumpversion:file:sekizai/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:CHANGELOG.rst]
+search =
+ unreleased
+ ==========
+replace =
+ unreleased
+ ==========
+
+ {new_version} {utcnow:%%Y-%%m-%%d}
+ ================
+
+[flake8]
+max-line-length = 119
+exclude =
+ *.egg-info,
+ .eggs,
+ .env,
+ .git,
+ .settings,
+ .tox,
+ .venv,
+ build,
+ data,
+ dist,
+ docs/conf.py,
+ *migrations*,
+ requirements,
+ tmp
+
+[isort]
+line_length = 119
+skip = manage.py, *migrations*, .tox, .eggs, data, .env, .venv
+include_trailing_comma = true
+multi_line_output = 5
+lines_after_imports = 2
+default_section = THIRDPARTY
+sections = FUTURE, STDLIB, DJANGO, THIRDPARTY, FIRSTPARTY, LOCALFOLDER
+known_first_party = sekizai
+known_django = django
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/setup.py
new/django-sekizai-4.1.0/setup.py
--- old/django-sekizai-2.0.0/setup.py 2020-08-26 11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/setup.py 2023-05-02 17:35:32.000000000 +0200
@@ -1,12 +1,12 @@
#!/usr/bin/env python
-from setuptools import find_packages, setup
+from pathlib import Path
-from sekizai import __version__
+from setuptools import find_packages, setup
REQUIREMENTS = [
- 'django>=2.2',
- 'django-classy-tags>=1',
+ 'django>=3.2',
+ 'django-classy-tags>=3.0',
]
@@ -17,32 +17,39 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
'Framework :: Django',
- 'Framework :: Django :: 2.2',
- 'Framework :: Django :: 3.0',
- 'Framework :: Django :: 3.1',
+ 'Framework :: Django :: 3.2',
+ 'Framework :: Django :: 4.0',
+ 'Framework :: Django :: 4.1',
+ 'Framework :: Django :: 4.2',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries',
]
+this_directory = Path(__file__).parent
+long_description = (this_directory / "README.rst").read_text()
setup(
name='django-sekizai',
- version=__version__,
+ version='4.1.0',
author='Jonas Obrist',
author_email='[email protected]',
- url='http://github.com/ojii/django-sekizai',
+ maintainer='Django CMS Association and contributors',
+ maintainer_email='[email protected]',
+ url='https://github.com/django-cms/django-sekizai',
license='BSD-3-Clause',
description='Django Sekizai',
- long_description=open('README.rst').read(),
- packages=find_packages(),
+ long_description=long_description,
+ long_description_content_type='text/x-rst',
+ packages=find_packages(exclude=['tests']),
+ python_requires='>=3.8',
include_package_data=True,
zip_safe=False,
install_requires=REQUIREMENTS,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/tests/requirements/base.txt
new/django-sekizai-4.1.0/tests/requirements/base.txt
--- old/django-sekizai-2.0.0/tests/requirements/base.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/tests/requirements/base.txt 2023-05-02
17:35:32.000000000 +0200
@@ -0,0 +1,4 @@
+# other requirements
+tox
+coverage
+flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/tests/requirements.txt
new/django-sekizai-4.1.0/tests/requirements.txt
--- old/django-sekizai-2.0.0/tests/requirements.txt 2020-08-26
11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/tests/requirements.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# other requirements
-tox
-coverage
-flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-sekizai-2.0.0/tests/templates/with_data_basic.html
new/django-sekizai-4.1.0/tests/templates/with_data_basic.html
--- old/django-sekizai-2.0.0/tests/templates/with_data_basic.html
1970-01-01 01:00:00.000000000 +0100
+++ new/django-sekizai-4.1.0/tests/templates/with_data_basic.html
2023-05-02 17:35:32.000000000 +0200
@@ -0,0 +1,25 @@
+{% load sekizai_tags %}<!DOCTYPE html>
+<html>
+ <head>
+ <title>{% block title %}{% block pagetitle %}{% endblock pagetitle %}{%
endblock title %}</title>
+ {% with_data "google-fonts" as fonts %}{% if fonts %}
+ <link href="https://fonts.googleapis.com/css?family={{ fonts|join:',' }}"
rel="stylesheet">
+ {% endif %}{% end_with_data %}
+ <!-- Compressed CSS -->
+ {% render_block "css" %}
+ <!-- Live CSS -->
+ {% block live_css %}{% endblock live_css %}
+ {% block head %}{% endblock head %}
+ </head>
+
+ <body>
+ <h1>Test page.</h1>
+ {% block breadcrumb %}{% endblock %}
+ {% block content %}
+ <p>This page intentionally left blank.</p>
+ {% endblock content %}
+ {% render_block "js" %}
+ {% block live_js %}{% endblock live_js %}
+ </body>
+</html>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/tests/test_core.py
new/django-sekizai-4.1.0/tests/test_core.py
--- old/django-sekizai-2.0.0/tests/test_core.py 2020-08-26 11:20:48.000000000
+0200
+++ new/django-sekizai-4.1.0/tests/test_core.py 2023-05-02 17:35:32.000000000
+0200
@@ -10,12 +10,8 @@
from sekizai import context_processors
from sekizai.context import SekizaiContext
-from sekizai.helpers import (
- Watcher, get_namespaces, get_varname, validate_template,
-)
-from sekizai.templatetags.sekizai_tags import (
- import_processor, validate_context,
-)
+from sekizai.helpers import Watcher, get_namespaces, get_varname,
validate_template
+from sekizai.templatetags.sekizai_tags import import_processor,
validate_context
def null_processor(context, data, namespace):
@@ -143,13 +139,13 @@
line1 = '-' * padlen
line2 = '-' * (longest - len('Result'))
msg = '\nExpected%s | | Result' % padding
- msg += '\n--------%s-|---|-------%s' % (line1, line2)
+ msg += f'\n--------{line1}-|---|-------{line2}'
for success, a, b in data:
pad = ' ' * (longest - len(a))
if success:
- msg += '\n%s%s | | %s' % (a, pad, b)
+ msg += f'\n{a}{pad} | | {b}'
else:
- msg += '\n%s%s | ! | %s' % (a, pad, b)
+ msg += f'\n{a}{pad} | ! | {b}'
return BitDiffResult(False, msg)
@@ -383,6 +379,9 @@
def test_validate_template_js_css(self):
self.assertTrue(validate_template('basic.html', ['js', 'css']))
+ def test_validate_template_with_data(self):
+ self.assertTrue(validate_template('with_data_basic.html', ['js',
'css']))
+
def test_validate_template_js(self):
self.assertTrue(validate_template('basic.html', ['js']))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-sekizai-2.0.0/tox.ini
new/django-sekizai-4.1.0/tox.ini
--- old/django-sekizai-2.0.0/tox.ini 2020-08-26 11:20:48.000000000 +0200
+++ new/django-sekizai-4.1.0/tox.ini 2023-05-02 17:35:32.000000000 +0200
@@ -2,56 +2,34 @@
envlist =
flake8
isort
- py{35,36,37,38}-dj{22}
- py{36,37,38}-dj{30,31}
+ py{38,39,310}-dj{32,40,41}
+ py{310,311}-dj{42,main}
skip_missing_interpreters=True
-[flake8]
-max-line-length = 119
-exclude =
- *.egg-info,
- .eggs,
- .git,
- .settings,
- .tox,
- build,
- data,
- dist,
- docs,
- *migrations*,
- requirements,
- tmp
-
-[isort]
-line_length = 79
-skip = manage.py, *migrations*, .tox, .eggs, data
-include_trailing_comma = true
-multi_line_output = 5
-not_skip = __init__.py
-lines_after_imports = 2
-default_section = THIRDPARTY
-sections = FUTURE, STDLIB, DJANGO, THIRDPARTY, FIRSTPARTY, LIB, LOCALFOLDER
-known_first_party = sekizai
-known_django = django
-
[testenv]
deps =
- -r{toxinidir}/tests/requirements.txt
- dj22: Django>=2.2,<3.0
- dj30: Django>=3.0,<3.1
- dj31: Django>=3.1,<3.2
+ -r{toxinidir}/tests/requirements/base.txt
+ dj32: Django>=3.2,<3.3
+ dj40: Django>=4.0,<4.1
+ dj41: Django>=4.1,<4.2
+ dj42: Django>=4.2,<5.0
+ djmain: https://github.com/django/django/archive/main.tar.gz
commands =
{envpython} --version
{env:COMMAND:coverage} erase
{env:COMMAND:coverage} run setup.py test
{env:COMMAND:coverage} report
+ignore_outcome =
+ djmain: True
+ignore_errors =
+ djmain: True
[testenv:flake8]
deps = flake8
-commands = flake8
+commands = flake8 --config=setup.cfg
[testenv:isort]
deps = isort
-commands = isort -c -rc -df sekizai
+commands = isort -c -df sekizai
skip_install = true
