From c9ed44f7d684ac369bf46e2c97345ec2a8867555 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 18:06:13 +0200 Subject: Adding debian version 3.1.2-1. Signed-off-by: Daniel Baumann --- debian/changelog | 460 +++++++++++++++++++++ debian/control | 71 ++++ debian/copyright | 73 ++++ debian/jinja.vim | 135 ++++++ debian/jinja.yaml | 4 + ...02-docs-disable-sphinxcontrib.log_cabinet.patch | 22 + debian/patches/0003-fix-nose-leftovers.patch | 38 ++ debian/patches/py3.9-fix-collections-import.patch | 104 +++++ debian/patches/series | 3 + debian/python-jinja2-doc.docs | 1 + debian/python-jinja2-doc.examples | 1 + debian/python-jinja2-doc.links | 5 + debian/python-jinja2.pyremove | 2 + debian/python3-jinja2.bcep | 1 + debian/python3-jinja2.dirs | 2 + debian/python3-jinja2.install | 2 + debian/rules | 32 ++ debian/salsa-ci.yml | 4 + debian/source/format | 1 + debian/tests/control | 4 + debian/tests/unittests | 10 + debian/watch | 3 + 22 files changed, 978 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/jinja.vim create mode 100644 debian/jinja.yaml create mode 100644 debian/patches/0002-docs-disable-sphinxcontrib.log_cabinet.patch create mode 100644 debian/patches/0003-fix-nose-leftovers.patch create mode 100644 debian/patches/py3.9-fix-collections-import.patch create mode 100644 debian/patches/series create mode 100644 debian/python-jinja2-doc.docs create mode 100644 debian/python-jinja2-doc.examples create mode 100644 debian/python-jinja2-doc.links create mode 100644 debian/python-jinja2.pyremove create mode 100644 debian/python3-jinja2.bcep create mode 100644 debian/python3-jinja2.dirs create mode 100644 debian/python3-jinja2.install create mode 100755 debian/rules create mode 100644 debian/salsa-ci.yml create mode 100644 debian/source/format create mode 100644 debian/tests/control create mode 100644 debian/tests/unittests create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..f866773 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,460 @@ +jinja2 (3.1.2-1) unstable; urgency=medium + + [ Thomas Goirand ] + * Add python3-pytest as build-depends (now run tests at build time). + * Add autopkgtest. + + [ Piotr Ożarowski ] + * New upstream release (closes: 1025808, 1023637) + * Add 0003-fix-nose-leftovers patch + * Bump minimum required python3-pallets-sphinx-themes build dependency + (closes: 1005864) + + -- Piotr Ożarowski Fri, 24 Feb 2023 16:15:45 +0100 + +jinja2 (3.0.3-2) unstable; urgency=medium + + * Team upload. + * Downgrading python3-babel from depends to recommends (Closes: #1019580). + + -- Thomas Goirand Tue, 13 Sep 2022 10:26:29 +0200 + +jinja2 (3.0.3-1) unstable; urgency=medium + + * New upstream release + + -- Piotr Ożarowski Fri, 11 Feb 2022 13:50:47 +0100 + +jinja2 (3.0.1-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 01 Oct 2021 11:22:02 +0200 + +jinja2 (3.0.1-1) experimental; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since stretch: + + Build-Depends: Drop versioned constraint on python-setuptools. + + [ Thomas Goirand ] + * Team upload. + * New upstream release. + * Ran wrap-and-sort -bastk. + * Fixed (build-)depends for this release. + * Killed the python2 package. + * Rebase patches: + - re-wrote py3.9-fix-collections-import.patch + - refreshed 0002-docs-disable-sphinxcontrib.log_cabinet.patch + * Use debian/jinja.vim instead of the one upstream, gone in this version. + + -- Thomas Goirand Fri, 17 Sep 2021 23:25:00 +0200 + +jinja2 (2.11.3-1) unstable; urgency=medium + + * Team upload. + + [ Ondřej Nový ] + * d/control: Update Vcs-* fields with new Debian Python Team Salsa + layout. + + [ Debian Janitor ] + * Apply multi-arch hints. + + python-jinja2-doc: Add Multi-Arch: foreign. + + [ Sandro Tosi ] + * Use the new Debian Python Team contact name and address + + [ Hans-Christoph Steiner ] + * New upstream release + + -- Hans-Christoph Steiner Mon, 01 Mar 2021 12:05:52 +0100 + +jinja2 (2.11.2-1) unstable; urgency=medium + + * New upstream release + + -- Piotr Ożarowski Thu, 04 Jun 2020 19:31:21 +0200 + +jinja2 (2.11.1-1) unstable; urgency=medium + + [ Thomas Goirand ] + * py3.9-fix-collections-import.patch: correctly "except ImportError:" + everywhere in the patch. + + [ Salman Mohammadi ] + * d/control: change python-jinja2-doc to recommend python3-jinja2 + (closes: 951672) + + + [ Piotr Ożarowski ] + * New upstream release + * Add python3-pallets-sphinx-themes and python3-sphinx-issues to Build-Depends + * Add patch to disable sphinxcontrib.log_cabinet for now as it's not + packaged in Debian yet (versionadded, versionchanged, deprecated + directives in changelog will not be used) + * Move Vim syntax files to python3-jinja2 package + * Standards-version bumped to 4.5.0 (no other changes needed) + + -- Piotr Ożarowski Thu, 02 Apr 2020 13:35:21 +0200 + +jinja2 (2.10.1-2) unstable; urgency=medium + + [ Ondřej Nový ] + * Use debhelper-compat instead of debian/compat. + * Bump Standards-Version to 4.4.1. + + [ Thomas Goirand ] + * Team upload. + * Add py3.9-fix-collections-import.patch (Closes: #949018). + + -- Thomas Goirand Thu, 27 Feb 2020 11:49:32 +0100 + +jinja2 (2.10.1-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + * d/changelog: Remove trailing whitespaces + * d/control: Remove ancient X-Python-Version field + * d/control: Remove ancient X-Python3-Version field + * Convert git repository from git-dpm to gbp layout + + [ Piotr Ożarowski ] + * New upstream release + * Standards-version bumped to 4.4.0 (no other changes needed) + + -- Piotr Ożarowski Wed, 10 Jul 2019 22:34:15 +0200 + +jinja2 (2.10-2) unstable; urgency=high + + [ Thomas Goirand ] + * CVE-2019-10906: In Pallets Jinja before 2.10.1, str.format_map allows a + sandbox escape. Applied upstream patch: sandbox_str.format_map.patch + (Closes: #926602). + + -- Piotr Ożarowski Tue, 09 Apr 2019 21:58:20 +0200 + +jinja2 (2.10-1) unstable; urgency=medium + + * New upstream release + * Add python3-sphinx to Build-Depends and invoke dh_sphinxdoc after building + documentation + * Standards-version bumped to 4.1.1 + - -doc package's Priority changed to optional + + -- Piotr Ożarowski Thu, 30 Nov 2017 10:54:37 +0100 + +jinja2 (2.9.6-1) unstable; urgency=medium + + [ Piotr Ożarowski ] + * New upstream release + * Install CHANGES file as upstream changelog (closes: 857722) + * Standards-version bumped to 4.0.0 (no other changes needed) + + [ Michael Hudson-Doyle ] + * Install asyncsupport.py and asyncfilters.py now that Python 3.6 is a + supported version (but do not compile them on install with Python 3.5). + (closes: 862699) + + -- Piotr Ożarowski Tue, 20 Jun 2017 15:21:18 +0200 + +jinja2 (2.9.5-1) unstable; urgency=medium + + * New upstream release + - restores original repr of the internal _GroupTuple which fixes ansible + (closes: 851741) + + -- Piotr Ożarowski Tue, 07 Feb 2017 22:27:54 +0100 + +jinja2 (2.9.4-1) unstable; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + [ Piotr Ożarowski ] + * New upstream release + - do not install async* files, they require Python >= 3.6 + * Standards-version bumped to 3.9.8 (no other changes needed) + + -- Piotr Ożarowski Tue, 10 Jan 2017 20:28:57 +0100 + +jinja2 (2.8-1) unstable; urgency=medium + + * New upstream release + - drop jinja2-typos and drop_next_import_from_docs-jinjaext patches - both + applied upstream + * rewrite debian/rules to dh sequencer and pybuild buildsystem + * Standards-version bumped to 3.9.6 (no other changes needed) + + -- Piotr Ożarowski Sat, 01 Aug 2015 14:15:36 +0200 + +jinja2 (2.7.3-1) unstable; urgency=medium + + * New upstream release + * Drop fix_CVE-2014-0012.patch (better fix applied upstream) + * Homepage updated + + -- Piotr Ożarowski Tue, 10 Jun 2014 20:44:26 +0200 + +jinja2 (2.7.2-2) unstable; urgency=high + + * Add fix_CVE-2014-1402 patch which uses tempfile.mkdtemp to create + cache dir (closes: 734956) + + -- Piotr Ożarowski Sun, 12 Jan 2014 15:09:04 +0100 + +jinja2 (2.7.2-1) unstable; urgency=high + + * New upstream release + - changes default folder for the filesystem cache (closes: 734747, + CVE-2014-1402) + + -- Piotr Ożarowski Fri, 10 Jan 2014 20:56:20 +0100 + +jinja2 (2.7.1-1) unstable; urgency=low + + * New upstream release + + -- Piotr Ożarowski Thu, 08 Aug 2013 22:25:01 +0200 + +jinja2 (2.7-3) unstable; urgency=low + + [ Jakub Wilk ] + * Restore Python 3.2 compatibility (closes: #709638) + * Fix bunch of typos in the documentation (closes: #679534) + + -- Piotr Ożarowski Sat, 25 May 2013 23:07:10 +0200 + +jinja2 (2.7-2) unstable; urgency=low + + * Relax build dependency on python3-all and hardcode python3-jinja2's + Depends and postinst maintainer script (temporary fix, closes: #709390) + + -- Piotr Ożarowski Thu, 23 May 2013 18:42:20 +0200 + +jinja2 (2.7-1) unstable; urgency=low + + [ Jakub Wilk ] + * Use canonical URIs for Vcs-* fields. + + [ Piotr Ożarowski ] + * New upstream release + - minimum required Python version bumped to 2.6 and 3.3 + * debugsupport extension no longer available, Architecture changed to "all" + * Bump minimum required python3-all version in Build-Depends (to generate + versioned py3compile -V in maintainer script) + * Add patches/drop_next_import_from_docs-jinjaext.patch to fix building docs + * Use dh_sphinxdoc to handle JavaScript libraries used in -doc package + * Standards-Version bumped to 3.9.4 + - add build-arch and build-indep targets + * debian/compat changed to 9 + + -- Piotr Ożarowski Mon, 20 May 2013 21:15:37 +0200 + +jinja2 (2.6-1) unstable; urgency=low + + * New upstream release + * add_version_placeholder patch removed (no longer needed) + * htmljinja.vim is no longer available, use jinja.vim instead + * python3-jinja2 suggests python-jinja2-doc instead of python3-jinja2-doc + * Standards-version bumped to 3.9.2 (no other changes needed) + + -- Piotr Ożarowski Mon, 25 Jul 2011 10:31:24 +0200 + +jinja2 (2.5.5-5) unstable; urgency=low + + * Drop hardcoded python3.1 from Depends (closes: #621816) + * Do not compress objects.inv file (closes: #608757) + + -- Piotr Ożarowski Fri, 15 Apr 2011 22:05:53 +0200 + +jinja2 (2.5.5-4) unstable; urgency=low + + * Upload to unstable (closes: 621001) + * Lower versions of build dependencies (to the ones from 2.5.5-1) + * Convert from dh_pysupport to dh_python2 + * Change source format to 3.0 (quilt), drop quilt build dependency + + -- Piotr Ożarowski Tue, 05 Apr 2011 23:21:21 +0200 + +jinja2 (2.5.5-3) experimental; urgency=low + + * Bump minimum required python-support version to the one in experimental + to get Python 2.7 support (closes: 608149) + + -- Piotr Ożarowski Mon, 27 Dec 2010 23:15:04 +0100 + +jinja2 (2.5.5-2) experimental; urgency=low + + * Rebuild for Python 2.7 and 3.2 extension (minimum required python-all's + version temporary bumped to 2.6.6-4, python-setuptools' to 0.6.14-5 + and python3-all's to 3.1.2-14 to make sure the right version from + experimental will be used). Closes: 607450. + * Update debian/rules to handle Python >= 3.2 + + -- Piotr Ożarowski Tue, 21 Dec 2010 20:58:19 +0100 + +jinja2 (2.5.5-1) unstable; urgency=low + + * New upstream release + + -- Piotr Ożarowski Tue, 19 Oct 2010 08:34:49 +0200 + +jinja2 (2.5.4-1) unstable; urgency=low + + * New upstream release + + -- Piotr Ożarowski Sun, 17 Oct 2010 20:48:21 +0200 + +jinja2 (2.5.2-3) unstable; urgency=low + + * Rebuild against newer python3-all-dev package (python3.1 now uses + /usr/lib/python3/), minimum python3-all version bumped to 3.1.2-10 + * Use python3's python.mk + * Drop python3-jinja2.{postinst,prerm} maintainer scripts, dh_python3 will + generate them + + -- Piotr Ożarowski Sun, 26 Sep 2010 21:19:54 +0200 + +jinja2 (2.5.2-2) unstable; urgency=low + + * Really remove _markupsafe + + -- Piotr Ożarowski Thu, 19 Aug 2010 09:24:47 +0200 + +jinja2 (2.5.2-1) unstable; urgency=low + + * New upstream release + - speedups module moved to separate package: MarkupSafe + * python-markupsafe added to Depends (jinja2._markupsafe removed from the + package) + * debian/control: python3-jinja2 binary package updated to latest changes in + dh_python3 + * Standards-version bumped to 3.9.1 (no other changes needed) + + -- Piotr Ożarowski Wed, 18 Aug 2010 11:29:44 +0200 + +jinja2 (2.5-1) unstable; urgency=low + + * New upstream release + * python3_builtins.patch removed, no longer needed + * add python3.1 to python3-jinja2's Depends + + -- Piotr Ożarowski Sun, 30 May 2010 11:01:51 +0200 + +jinja2 (2.4.1-1) unstable; urgency=low + + * New upstream release + * Add python3_builtins.patch taken from upstream repo (Different name for + builtins in Python 3) + + -- Piotr Ożarowski Tue, 20 Apr 2010 19:51:16 +0200 + +jinja2 (2.4-3) unstable; urgency=low + + * Add missing maintainer scripts in python3-jinja2 package + + -- Piotr Ożarowski Sun, 18 Apr 2010 17:15:49 +0200 + +jinja2 (2.4-2) unstable; urgency=low + + * Add Python 3 support, new binary packages: + python3-jinja2 and python3-jinja2-dbg + + -- Piotr Ożarowski Tue, 13 Apr 2010 20:44:43 +0200 + +jinja2 (2.4-1) unstable; urgency=low + + * New upstream release + + -- Piotr Ożarowski Tue, 13 Apr 2010 19:52:05 +0200 + +jinja2 (2.3.1-1) unstable; urgency=low + + * New upstream release + * Move python-pybabel from Recommends to Enhances + + -- Piotr Ożarowski Fri, 19 Feb 2010 18:31:52 +0100 + +jinja2 (2.3-1) unstable; urgency=low + + * New upstream release + * Hardcode __version__ at build time, no need to use pkg_resources + (Closes: #548062) + * Standards-version bumped to 3.8.4 (no other changes needed) + + -- Piotr Ożarowski Wed, 10 Feb 2010 22:06:28 +0100 + +jinja2 (2.2.1-1) unstable; urgency=low + + * New upstream release + + -- Piotr Ożarowski Tue, 15 Sep 2009 19:38:47 +0200 + +jinja2 (2.2-1) unstable; urgency=low + + [ Jakub Wilk ] + * Build depend on Sphinx >= 0.6 (due to changes_for_sphinx_0.6 patch) + + [ Piotr Ożarowski ] + * New upstream release (Closes: #536227) + * No longer needed patches: + - changes_for_sphinx_0.6.patch + - dont_install_docs_via_setup_py.patch + * pass --with-speedups to setup.py (building extension is now disabled by + default in upstream code) + * debian/copyright file updated + * Standards-version bumped to 3.8.3 (no other changes needed) + + -- Piotr Ożarowski Sun, 13 Sep 2009 16:44:18 +0200 + +jinja2 (2.1.1-3) unstable; urgency=low + + * Documentation builds fine with new Sphinx now, thanks to + Jakub Wilk for the patch (Closes: #527486) + * Standards-version bumped to 3.8.2: + - python-jinja2-dbg's section changed to debug + * Support /usr/local/*/dist-packages in debian/rules (python2.6 will need it) + + -- Piotr Ożarowski Wed, 08 Jul 2009 21:40:46 +0200 + +jinja2 (2.1.1-2) unstable; urgency=low + + * Install Vim syntax files in /usr/share/vim/addons/syntax/ + Use `vim-addons install jinja` to enable it (Closes: 514046) + * Upload to unstable + + -- Piotr Ożarowski Tue, 10 Feb 2009 19:59:56 +0100 + +jinja2 (2.1.1-1) experimental; urgency=low + + * New upstream release + * Build depend on Sphinx >= 0.5.1 + + remove_non_ascii_char patch removed + + -- Piotr Ożarowski Thu, 25 Dec 2008 19:10:36 +0100 + +jinja2 (2.1-1) experimental; urgency=low + + [ Sandro Tosi ] + * Switch Vcs-Browser field to viewsvn + + [ Piotr Ożarowski ] + * New upstream release + * Bump required python-sphinx version to >= 0.5 (needed to build docs) + + upload to experimental (Sphinx 0.5 is in experimental for now) + * Add remove_non_ascii_char patch (to workaround docutils/Sphinx bug) + + -- Piotr Ożarowski Sun, 30 Nov 2008 20:14:33 +0100 + +jinja2 (2.0-2) unstable; urgency=low + + * Recommend python-pybabel instead of python-babel (Closes: #501725) + + -- Piotr Ożarowski Thu, 09 Oct 2008 22:43:11 +0200 + +jinja2 (2.0-1) unstable; urgency=low + + * Initial release (this package is an successor of jinja package) + + -- Piotr Ożarowski Sun, 20 Jul 2008 23:01:02 +0200 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..80b01fc --- /dev/null +++ b/debian/control @@ -0,0 +1,71 @@ +Source: jinja2 +Section: python +Priority: optional +Maintainer: Piotr Ożarowski +Uploaders: + Debian Python Team , +Build-Depends: + debhelper-compat (= 12), + dh-python, + python3-all, + python3-babel, + python3-markupsafe (>= 2.0), + python3-pallets-sphinx-themes (>= 2.0.2), + python3-pygments, + python3-pytest, + python3-setuptools, + python3-sphinx, + python3-sphinx-issues, +Standards-Version: 4.5.0 +Homepage: http://jinja.pocoo.org/ +Vcs-Git: https://salsa.debian.org/python-team/packages/jinja2.git +Vcs-Browser: https://salsa.debian.org/python-team/packages/jinja2 + +Package: python-jinja2-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Recommends: + python3-jinja2, +Multi-Arch: foreign +Description: documentation for the Jinja2 Python library + Jinja2 is a small but fast and easy to use stand-alone template engine + . + This package contains the documentation for Jinja2 in HTML and + reStructuredText formats. + +Package: python3-jinja2 +Architecture: all +Depends: + python3-markupsafe (>= 2.0), + ${misc:Depends}, + ${python3:Depends}, +Recommends: + python3-babel, + python3-pkg-resources, +Suggests: + python-jinja2-doc, +Breaks: + python-jinja2 (<< 2.11.1-1), +Replaces: + python-jinja2 (<< 2.11.1-1), +Description: small but fast and easy to use stand-alone template engine + Jinja2 is a template engine written in pure Python. It provides a Django + inspired non-XML syntax but supports inline expressions and an optional + sandboxed environment. + . + The key-features are: + * Configurable syntax. If you are generating LaTeX or other formats with + Jinja2 you can change the delimiters to something that integrates better + into the LaTeX markup. + * Fast. While performance is not the primarily target of Jinja2 it’s + surprisingly fast. The overhead compared to regular Python code was reduced + to the very minimum. + * Easy to debug. Jinja2 integrates directly into the Python traceback system + which allows you to debug Jinja2 templates with regular Python debugging + helpers. + * Secure. It’s possible to evaluate untrusted template code if the optional + sandbox is enabled. This allows Jinja2 to be used as templating language + for applications where users may modify the template design. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b860782 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,73 @@ +This package was debianized by Piotr Ożarowski on +Mon, 14 Jul 2008 23:45:03 +0200. + +It was downloaded from http://pypi.python.org/pypi/Jinja2 + +Copyright (c) 2009-2011 by the Jinja Team, see AUTHORS for more details. + +Some rights reserved. + +License: + + 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. + + * The names of the contributors may not 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 THE COPYRIGHT + OWNER OR CONTRIBUTORS 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. + + --------------------------------------------------------------- + +docs/_build/html/_static/interface.js and docs/_build/html/_static/jquery.js +(source package only) are part of jQuery project (Copyright (c) 2006 Stefan +Petre) and are licensed under dual licensed under the MIT and GPL licenses. + + --------------------------------------------------------------- + +ext/jinja.el (source package only): + +Author: Georg Brandl + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + + --------------------------------------------------------------- + +The Debian packaging is © 2008-2011, Piotr Ożarowski and +is licensed under the same license as Jinja2. diff --git a/debian/jinja.vim b/debian/jinja.vim new file mode 100644 index 0000000..2fd5838 --- /dev/null +++ b/debian/jinja.vim @@ -0,0 +1,135 @@ +" Vim syntax file +" Language: Jinja template +" Maintainer: Armin Ronacher +" Last Change: 2008 May 9 +" Version: 1.1 +" +" Known Bugs: +" because of odd limitations dicts and the modulo operator +" appear wrong in the template. +" +" Changes: +" +" 2008 May 9: Added support for Jinja2 changes (new keyword rules) + +" .vimrc variable to disable html highlighting +if !exists('g:jinja_syntax_html') + let g:jinja_syntax_html=1 +endif + +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if !exists("main_syntax") + if version < 600 + syntax clear + elseif exists("b:current_syntax") + finish +endif + let main_syntax = 'jinja' +endif + +" Pull in the HTML syntax. +if g:jinja_syntax_html + if version < 600 + so :p:h/html.vim + else + runtime! syntax/html.vim + unlet b:current_syntax + endif +endif + +syntax case match + +" Jinja template built-in tags and parameters (without filter, macro, is and raw, they +" have special threatment) +syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import + +syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter +syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction +syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName + +" Variable Names +syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none False True None loop super caller varargs kwargs + +" Filters +syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite nextgroup=jinjaFilter +syn match jinjaFilter contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn match jinjaFunction contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn match jinjaBlockName contained /[a-zA-Z_][a-zA-Z0-9_]*/ + +" Jinja template constants +syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\(\\\)\@\)*\\"/ end=/"/ +syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\(\\\)\@\)*\\'/ end=/'/ +syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/ + +" Operators +syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/ +syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/ +syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute +syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/ + +" Jinja template tag and variable blocks +syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment + +syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment + +" Jinja template 'raw' tag +syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment + +" Jinja comments +syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment + +" Block start keywords. A bit tricker. We only highlight at the start of a +" tag block and only if the name is not followed by a comma or equals sign +" which usually means that we have to deal with an assignment. +syn match jinjaStatement containedin=jinjaTagBlock contained /\({%-\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/ + +" and context modifiers +syn match jinjaStatement containedin=jinjaTagBlock contained /\/ + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_jinja_syn_inits") + if version < 508 + let did_jinja_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink jinjaPunctuation jinjaOperator + HiLink jinjaAttribute jinjaVariable + HiLink jinjaFunction jinjaFilter + + HiLink jinjaTagDelim jinjaTagBlock + HiLink jinjaVarDelim jinjaVarBlock + HiLink jinjaCommentDelim jinjaComment + HiLink jinjaRawDelim jinja + + HiLink jinjaSpecial Special + HiLink jinjaOperator Normal + HiLink jinjaRaw Normal + HiLink jinjaTagBlock PreProc + HiLink jinjaVarBlock PreProc + HiLink jinjaStatement Statement + HiLink jinjaFilter Function + HiLink jinjaBlockName Function + HiLink jinjaVariable Identifier + HiLink jinjaString Constant + HiLink jinjaNumber Constant + HiLink jinjaComment Comment + + delcommand HiLink +endif + +let b:current_syntax = "jinja" + +if main_syntax == 'jinja' + unlet main_syntax +endif diff --git a/debian/jinja.yaml b/debian/jinja.yaml new file mode 100644 index 0000000..b225372 --- /dev/null +++ b/debian/jinja.yaml @@ -0,0 +1,4 @@ +addon: jinja +description: "allow syntax highlighting for Jinja templates" +files: + - syntax/jinja.vim diff --git a/debian/patches/0002-docs-disable-sphinxcontrib.log_cabinet.patch b/debian/patches/0002-docs-disable-sphinxcontrib.log_cabinet.patch new file mode 100644 index 0000000..e83c84f --- /dev/null +++ b/debian/patches/0002-docs-disable-sphinxcontrib.log_cabinet.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Piotr_O=C5=BCarowski?= +Date: Thu, 2 Apr 2020 13:41:14 +0200 +Subject: docs: disable sphinxcontrib.log_cabinet + +it's not packaged in Debian yet +--- + docs/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/conf.py b/docs/conf.py +index f65d462..43bcfda 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -15,7 +15,7 @@ extensions = [ + "sphinx.ext.autodoc", + "sphinx.ext.intersphinx", + "pallets_sphinx_themes", +- "sphinxcontrib.log_cabinet", ++ # "sphinxcontrib.log_cabinet", + "sphinx_issues", + ] + autodoc_typehints = "description" diff --git a/debian/patches/0003-fix-nose-leftovers.patch b/debian/patches/0003-fix-nose-leftovers.patch new file mode 100644 index 0000000..c35d7ee --- /dev/null +++ b/debian/patches/0003-fix-nose-leftovers.patch @@ -0,0 +1,38 @@ +From: =?utf-8?q?Piotr_O=C5=BCarowski?= +Date: Fri, 24 Feb 2023 16:06:57 +0100 +Subject: fix nose leftovers + +taken from upstream repo +--- + tests/test_loader.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/test_loader.py b/tests/test_loader.py +index 04c921d..77d686e 100644 +--- a/tests/test_loader.py ++++ b/tests/test_loader.py +@@ -183,6 +183,7 @@ class TestFileSystemLoader: + + class TestModuleLoader: + archive = None ++ mod_env = None + + def compile_down(self, prefix_loader, zip="deflated"): + log = [] +@@ -196,13 +197,14 @@ class TestModuleLoader: + self.mod_env = Environment(loader=loaders.ModuleLoader(self.archive)) + return "".join(log) + +- def teardown(self): +- if hasattr(self, "mod_env"): ++ def teardown_method(self): ++ if self.archive is not None: + if os.path.isfile(self.archive): + os.remove(self.archive) + else: + shutil.rmtree(self.archive) + self.archive = None ++ self.mod_env = None + + def test_log(self, prefix_loader): + log = self.compile_down(prefix_loader) diff --git a/debian/patches/py3.9-fix-collections-import.patch b/debian/patches/py3.9-fix-collections-import.patch new file mode 100644 index 0000000..7140c8b --- /dev/null +++ b/debian/patches/py3.9-fix-collections-import.patch @@ -0,0 +1,104 @@ +From: Thomas Goirand +Date: Wed, 1 Apr 2020 14:08:47 +0200 +Subject: Python 3.9: fix collections import + +Bug-Debian: https://bugs.debian.org/949018 +Forwarded: no +Last-Update: 2020-02-27 + +As collections has moved to collections.abc, this produces a warning which +may lead to unit testing errors: this is the case when building Rally. + +This patch attempts to import from collections.abc, and if it fails, falls +back to collections. This should be harmless. + +Note that this patch is probably useless with future version, as hopefully, +upstream will fix it (I didn't check). However, I didn't dare upgrading the +package to the major upstream release 3.x. +--- + src/jinja2/lexer.py | 5 ++++- + src/jinja2/nodes.py | 5 ++++- + src/jinja2/sandbox.py | 5 ++++- + src/jinja2/utils.py | 5 ++++- + tests/test_utils.py | 5 ++++- + 5 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/src/jinja2/lexer.py b/src/jinja2/lexer.py +index aff7e9f..37ef342 100644 +--- a/src/jinja2/lexer.py ++++ b/src/jinja2/lexer.py +@@ -6,7 +6,10 @@ template code and python code in expressions. + import re + import typing as t + from ast import literal_eval +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + from sys import intern + + from ._identifier import pattern as name_re +diff --git a/src/jinja2/nodes.py b/src/jinja2/nodes.py +index b2f88d9..53da1e9 100644 +--- a/src/jinja2/nodes.py ++++ b/src/jinja2/nodes.py +@@ -5,7 +5,10 @@ to normalize nodes. + import inspect + import operator + import typing as t +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + + from markupsafe import Markup + +diff --git a/src/jinja2/sandbox.py b/src/jinja2/sandbox.py +index 06d7414..f443c18 100644 +--- a/src/jinja2/sandbox.py ++++ b/src/jinja2/sandbox.py +@@ -6,7 +6,10 @@ import types + import typing as t + from _string import formatter_field_name_split # type: ignore + from collections import abc +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + from string import Formatter + + from markupsafe import EscapeFormatter +diff --git a/src/jinja2/utils.py b/src/jinja2/utils.py +index 9b5f5a5..205b2af 100644 +--- a/src/jinja2/utils.py ++++ b/src/jinja2/utils.py +@@ -4,7 +4,10 @@ import os + import re + import typing as t + from collections import abc +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + from random import choice + from random import randrange + from threading import Lock +diff --git a/tests/test_utils.py b/tests/test_utils.py +index 7b58af1..9013d7c 100644 +--- a/tests/test_utils.py ++++ b/tests/test_utils.py +@@ -1,6 +1,9 @@ + import pickle + import random +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + from copy import copy as shallow_copy + + import pytest diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3465d32 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +py3.9-fix-collections-import.patch +0002-docs-disable-sphinxcontrib.log_cabinet.patch +0003-fix-nose-leftovers.patch diff --git a/debian/python-jinja2-doc.docs b/debian/python-jinja2-doc.docs new file mode 100644 index 0000000..4ecc793 --- /dev/null +++ b/debian/python-jinja2-doc.docs @@ -0,0 +1 @@ +docs/_build/html diff --git a/debian/python-jinja2-doc.examples b/debian/python-jinja2-doc.examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/debian/python-jinja2-doc.examples @@ -0,0 +1 @@ +examples/* diff --git a/debian/python-jinja2-doc.links b/debian/python-jinja2-doc.links new file mode 100644 index 0000000..99f63cb --- /dev/null +++ b/debian/python-jinja2-doc.links @@ -0,0 +1,5 @@ +/usr/share/doc/python-jinja2-doc/examples /usr/share/doc/python3-jinja2/examples +/usr/share/doc/python-jinja2-doc/html /usr/share/doc/python-jinja2/html +/usr/share/doc/python-jinja2-doc/html /usr/share/doc/python3-jinja2/html +/usr/share/doc/python-jinja2-doc/html/_sources /usr/share/doc/python-jinja2/rst +/usr/share/doc/python-jinja2-doc/html/_sources /usr/share/doc/python3-jinja2/rst diff --git a/debian/python-jinja2.pyremove b/debian/python-jinja2.pyremove new file mode 100644 index 0000000..0d51d15 --- /dev/null +++ b/debian/python-jinja2.pyremove @@ -0,0 +1,2 @@ +jinja2/asyncfilters.py +jinja2/asyncsupport.py diff --git a/debian/python3-jinja2.bcep b/debian/python3-jinja2.bcep new file mode 100644 index 0000000..39c7f78 --- /dev/null +++ b/debian/python3-jinja2.bcep @@ -0,0 +1 @@ +re|-3.6|/usr/lib/python3/dist-packages/jinja2|.*/async(support|filters).py diff --git a/debian/python3-jinja2.dirs b/debian/python3-jinja2.dirs new file mode 100644 index 0000000..0874de0 --- /dev/null +++ b/debian/python3-jinja2.dirs @@ -0,0 +1,2 @@ +/usr/share/vim/addons/syntax/ +/usr/share/vim/registry diff --git a/debian/python3-jinja2.install b/debian/python3-jinja2.install new file mode 100644 index 0000000..77355bc --- /dev/null +++ b/debian/python3-jinja2.install @@ -0,0 +1,2 @@ +debian/jinja.yaml /usr/share/vim/registry +debian/jinja.vim /usr/share/vim/addons/syntax/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3fa2c3b --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +export PYBUILD_NAME=jinja2 + +%: + dh $@ --with python3,sphinxdoc --buildsystem=pybuild + +override_dh_auto_clean: + make -C docs clean + dh_auto_clean + +override_dh_auto_build: + # make sure installed version of jinja2 is not used during tests: + dh_auto_build -- --disable=test + pybuild --test --system=custom --test-args='PYTHONPATH="{build_dir}" {interpreter} -m pytest tests' + # build documentation + PYTHONPATH=$(CURDIR)/src:$(CURDIR)/docs make -C docs html + +override_dh_installdocs: + # install into -doc package and keep the symlink + dh_installdocs -p python-jinja2-doc --doc-main-package python-jinja2-doc + dh_installdocs --remaining + +override_dh_installexamples: + # install into -doc package and keep the symlink + dh_installexamples -p python-jinja2-doc --doc-main-package python-jinja2-doc + dh_installexamples --remaining + +override_dh_installchangelogs: + dh_installchangelogs CHANGES.rst diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..9f5e81a --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,4 @@ +Tests: unittests +Depends: + @builddeps@, +Restrictions: allow-stderr diff --git a/debian/tests/unittests b/debian/tests/unittests new file mode 100644 index 0000000..a4c6cc7 --- /dev/null +++ b/debian/tests/unittests @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +set -x + +CWD=$(pwd) +PYTHON3S=$(py3versions -vs) +for i in ${PYTHON3S} ; do + PYTHON=python${i} python${i} -m pytest -v tests +done diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..a3aa165 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/Jinja2/Jinja2-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- cgit v1.2.3