Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-phply for openSUSE:Factory checked in at 2021-09-30 23:42:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-phply (Old) and /work/SRC/openSUSE:Factory/.python-phply.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-phply" Thu Sep 30 23:42:58 2021 rev:4 rq:921553 version:1.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-phply/python-phply.changes 2020-05-28 09:08:14.443864790 +0200 +++ /work/SRC/openSUSE:Factory/.python-phply.new.2443/python-phply.changes 2021-09-30 23:43:10.628454387 +0200 @@ -1,0 +2,7 @@ +Mon Sep 27 04:27:24 UTC 2021 - Steve Kowalik <[email protected]> + +- Add patch remove-nose.patch + * Stop using nose.tools. +- Use pytest rather than setup.py test + +------------------------------------------------------------------- New: ---- remove-nose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-phply.spec ++++++ --- /var/tmp/diff_new_pack.GgwnlV/_old 2021-09-30 23:43:11.932455880 +0200 +++ /var/tmp/diff_new_pack.GgwnlV/_new 2021-09-30 23:43:11.932455880 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-phply # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,14 +25,15 @@ Group: Development/Languages/Python URL: https://github.com/viraptor/phply Source: https://files.pythonhosted.org/packages/source/p/phply/phply-%{version}.tar.gz -BuildRequires: %{python_module nose} +Patch0: remove-nose.patch BuildRequires: %{python_module ply} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-ply Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch %python_subpackages @@ -41,6 +42,7 @@ %prep %setup -q -n phply-%{version} +%autopatch -p1 %build %python_build @@ -53,7 +55,7 @@ %python_expand rm -rf %{buildroot}%{$python_sitelib}/tests %check -%python_exec setup.py test +%pytest %post %python_install_alternative phpparse ++++++ remove-nose.patch ++++++ Index: phply-1.2.5/tests/test_filtered_lexer.py =================================================================== --- phply-1.2.5.orig/tests/test_filtered_lexer.py +++ phply-1.2.5/tests/test_filtered_lexer.py @@ -2,7 +2,6 @@ from __future__ import print_function from phply import phplex -import nose.tools import pprint def eq_tokens(input, expected, ignore=('WHITESPACE', 'OPEN_TAG', 'CLOSE_TAG')): @@ -23,7 +22,7 @@ def eq_tokens(input, expected, ignore=(' print('Token by token:') for out, exp in zip(output, expected): print('\tgot:', out, '\texpected:', exp) - nose.tools.eq_(out, exp) + assert out == exp assert len(output) == len(expected), \ 'output length was %d, expected %s' % (len(output), len(expected)) Index: phply-1.2.5/tests/test_lexer.py =================================================================== --- phply-1.2.5.orig/tests/test_lexer.py +++ phply-1.2.5/tests/test_lexer.py @@ -2,7 +2,6 @@ from __future__ import print_function from phply import phplex -import nose.tools import pprint def eq_tokens(input, expected, ignore=('WHITESPACE', 'OPEN_TAG', 'CLOSE_TAG')): @@ -23,7 +22,7 @@ def eq_tokens(input, expected, ignore=(' print('Token by token:') for out, exp in zip(output, expected): print('\tgot:', out, '\texpected:', exp) - nose.tools.eq_(out, exp) + assert out == exp assert len(output) == len(expected), \ 'output length was %d, expected %s' % (len(output), len(expected)) Index: phply-1.2.5/tests/test_parser.py =================================================================== --- phply-1.2.5.orig/tests/test_parser.py +++ phply-1.2.5/tests/test_parser.py @@ -4,7 +4,6 @@ from phply import phplex from phply.phpparse import make_parser from phply.phpast import * -import nose.tools import pprint import sys @@ -23,12 +22,12 @@ def eq_ast(input, expected, filename=Non print('Node by node:') for out, exp in zip(output, expected): print('\tgot:', out, '\texpected:', exp) - nose.tools.eq_(out, exp) + assert out == exp # compare line numbers, but only for top elements if with_top_lineno: print('\tgot line:', out.lineno, '\texpected:', exp.lineno) - nose.tools.eq_(out.lineno, exp.lineno) + assert out.lineno == exp.lineno assert len(output) == len(expected), \ 'output length was %d, expected %s' % (len(output), len(expected))
