Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-djvulibre for openSUSE:Factory checked in at 2021-08-12 09:01:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-djvulibre (Old) and /work/SRC/openSUSE:Factory/.python-djvulibre.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-djvulibre" Thu Aug 12 09:01:39 2021 rev:23 rq:911491 version:0.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-djvulibre/python-djvulibre.changes 2021-03-10 08:58:15.910951526 +0100 +++ /work/SRC/openSUSE:Factory/.python-djvulibre.new.1899/python-djvulibre.changes 2021-08-12 09:02:35.238063556 +0200 @@ -1,0 +2,8 @@ +Mon Jul 26 09:25:12 UTC 2021 - Matej Cepl <mc...@suse.com> + +- Port testing of the package to unittest, adding these patches: + * remove-all-dependencies-on-nose-in-the-code.patch + * remove-nose-in-documentation.patch + * sphinx_4_compatibility.patch + +------------------------------------------------------------------- New: ---- remove-all-dependencies-on-nose-in-the-code.patch remove-nose-in-documentation.patch sphinx_4_compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-djvulibre.spec ++++++ --- /var/tmp/diff_new_pack.y0CTry/_old 2021-08-12 09:02:35.702062830 +0200 +++ /var/tmp/diff_new_pack.y0CTry/_new 2021-08-12 09:02:35.706062824 +0200 @@ -27,10 +27,14 @@ Source0: https://files.pythonhosted.org/packages/source/p/python-djvulibre/%{name}-%{version}.tar.gz Source1: https://files.pythonhosted.org/packages/source/p/python-djvulibre/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring +Patch1: remove-all-dependencies-on-nose-in-the-code.patch +Patch2: remove-nose-in-documentation.patch +# PATCH-FIX-UPSTREAM sphinx_4_compatibility.patch gh#sphinx-doc/sphinx#7747 mc...@suse.com +# Sphinx doesn't stable API +Patch3: sphinx_4_compatibility.patch BuildRequires: %{python_module Cython >= 0.19.1} BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} -BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} BuildRequires: djvulibre BuildRequires: fdupes @@ -59,7 +63,8 @@ This package contains technical documentation. %prep -%setup -q +%autosetup -p1 + chmod -x examples/* %build @@ -74,8 +79,7 @@ %check cd tests/ -PYTHONPATH=%{buildroot}%{$python_sitearch} -%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m nose --exclude='^test_export_ps$' --verbose +%pyunittest_arch -v %files %{python_files} %license doc/COPYING ++++++ remove-all-dependencies-on-nose-in-the-code.patch ++++++ ++++ 2547 lines (skipped) ++++++ remove-nose-in-documentation.patch ++++++ >From e68b6780bc191645ac7bfd0085f8b68a58729e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mc...@cepl.eu> Date: Mon, 26 Jul 2021 09:45:53 +0200 Subject: [PATCH] Remove nose in documentation --- doc/README | 3 --- private/apt-install-build-reqs | 1 - private/build-and-test | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/README b/doc/README index 76f2b63..c808cb2 100644 --- a/doc/README +++ b/doc/README @@ -21,7 +21,6 @@ The following software is required to build python-djvulibre: Additionally, the following software is needed to run the tests: -* nose_ * subprocess32_ (only for Python 2.X) * DjVuLibre_ command-line tools * Ghostscript_ @@ -32,8 +31,6 @@ Additionally, the following software is needed to run the tests: https://cython.org/ .. _pkg-config: https://wiki.freedesktop.org/www/Software/pkg-config/ -.. _nose: - https://nose.readthedocs.io/ .. _subprocess32: https://pypi.org/project/subprocess32/ .. _Ghostscript: diff --git a/private/apt-install-build-reqs b/private/apt-install-build-reqs index 69beade..744ba5f 100755 --- a/private/apt-install-build-reqs +++ b/private/apt-install-build-reqs @@ -21,7 +21,6 @@ python-dev cython ' pkgs_tests=' -python-nose python-subprocess32 djvulibre-bin ghostscript diff --git a/private/build-and-test b/private/build-and-test index 08aa4fb..c86665b 100755 --- a/private/build-and-test +++ b/private/build-and-test @@ -45,6 +45,6 @@ printf '%s\n' "$@" \ | xargs -P"$opt_jobs" -t -I'{python}' env '{python}' setup.py build --build-lib 'build/{python}' cd tests printf '%s\n' "$@" \ -| xargs -t -I'{python}' env PYTHONPATH="$PWD/../build/{python}" '{python}' -c 'import nose; nose.main()' --verbose +| xargs -t -I'{python}' env PYTHONPATH="$PWD/../build/{python}" '{python}' -c 'import unittest; unittest.main()' --verbose # vim:ts=4 sts=4 sw=4 et -- 2.32.0 ++++++ sphinx_4_compatibility.patch ++++++ --- doc/api/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/doc/api/conf.py +++ b/doc/api/conf.py @@ -55,6 +55,6 @@ rst_epilog = ''' import sphinx.writers.html del sphinx.writers.html.HTMLTranslator.visit_math def setup(app): - app.add_stylesheet('docutils-math.css') + app.add_css_file('docutils-math.css') # vim:ts=4 sts=4 sw=4 et