#6 New upstream version (2.10.3)
Merged 24 days ago by thm. Opened a month ago by lbalhar.
rpms/ lbalhar/python-jinja2 master  into  master

file modified
+11 -18

@@ -1,8 +1,8 @@ 

  %global srcname Jinja2

  

  Name:           python-jinja2

- Version:        2.10.1

- Release:        5%{?dist}

+ Version:        2.10.3

+ Release:        1%{?dist}

  Summary:        General purpose template engine

  License:        BSD

  URL:            http://jinja.pocoo.org/

@@ -53,7 +53,6 @@ 

  BuildRequires:  python2-setuptools

  BuildRequires:  python2-babel >= 0.8

  BuildRequires:  python2-markupsafe >= 0.23

- BuildRequires:  python2-pytest

  Requires:       python2-babel >= 0.8

  Requires:       python2-markupsafe >= 0.23

  Requires:       python2-setuptools

@@ -82,6 +81,9 @@ 

  BuildRequires:  python3-pytest

  %if %{with docs}

  BuildRequires:  %{_bindir}/sphinx-build-3

+ BuildRequires:  python3-Pallets-Sphinx-Themes

+ BuildRequires:  python3-sphinxcontrib-log-cabinet

+ BuildRequires:  python3-sphinx-issues

  %endif

  Requires:       python3-babel >= 0.8

  Requires:       python3-markupsafe >= 0.23

@@ -107,10 +109,6 @@ 

  # cleanup

  find . -name '*.pyo' -o -name '*.pyc' -delete

  

- # fix EOL

- sed -i 's|\r$||g' LICENSE

- 

- 

  %build

  %if %{with python2}

  %py2_build

@@ -147,24 +145,17 @@ 

  

  

  %check

- %if %{with python2}

- # there are currently no tests in the jinja2 tarball

- # make test

- %endif # with python2

- 

  %if %{with python3}

- # there are currently no tests in the jinja2 tarball

- # make test

+ %{__python3} -m pytest tests

  %endif # with python3

  

  

  %if %{with python2}

  %files -n python2-jinja2

- %doc AUTHORS

  %doc CHANGES.rst

  %doc ext

  %doc examples

- %license LICENSE

+ %license LICENSE.rst

  %if %{with docs}

  %doc docs/_build/html

  %endif

@@ -175,11 +166,10 @@ 

  

  %if %{with python3}

  %files -n python3-jinja2

- %doc AUTHORS

  %doc CHANGES.rst

  %doc ext

  %doc examples

- %license LICENSE

+ %license LICENSE.rst

  %if %{with docs}

  %doc docs/_build/html

  %endif

@@ -189,6 +179,9 @@ 

  

  

  %changelog

+ * Mon Nov 11 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-1

+ - New upstream version (2.10.3)

+ 

  * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.10.1-5

  - Rebuilt for Python 3.8.0rc1 (#1748018)

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (Jinja2-2.10.1.tar.gz) = a00153a0e07bb7d67f301b4eaf7af657726a1985e9ffc7ae2d76bdbb4c062d672efc8065e398767e1039b18a483a0092e206deac91e4047aad64920b56869623

+ SHA512 (Jinja2-2.10.3.tar.gz) = c51c335450f46a467b0d40de1a51c149bdb4eb961ea888b64ff141e11b592b32e05040bfd9aa4a39892dda8d9d8cbf5a35b386ea16a247484d31b5b52eda1b8f

This is still WIP because the new build dependency fails to install in rawhide.

@lbalhar Do you know if the new version can build without the new build dependency on python3-Pallets-Sphinx-Themes?

@lbalhar Do you know if the new version can build without the new build dependency on python3-Pallets-Sphinx-Themes?

It should be possible if we disable the build of documentation because there is the direct import in sphinx conf.py file:

Traceback (most recent call last):
  File "/usr/lib/python3.8/site-packages/sphinx/config.py", line 361, in eval_config_file
    execfile_(filename, namespace)
  File "/usr/lib/python3.8/site-packages/sphinx/util/pycompat.py", line 86, in execfile_
    exec(code, _globals)
  File "/builddir/build/BUILD/Jinja2-2.10.3/docs/conf.py", line 1, in <module>
    from pallets_sphinx_themes import get_version
ModuleNotFoundError: No module named 'pallets_sphinx_themes'

1 new commit added

  • AUTHORS is generated only when docs is enabled
a month ago

@lbalhar Do you know if the new version can build without the new build dependency on python3-Pallets-Sphinx-Themes?

@torsava Thanks to your question, I've realized that the AUTHORS file should be also included only when documentation build is enabled.

rebased onto 1e018ae

a month ago

I'm done here. Besides the update, I've also enabled tests but only under Python 3 because python2-pytest has been retired in rawhide.

Scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=39077378

rebased onto acdee87

a month ago

Pull-Request has been merged by thm

24 days ago