diff --git a/pytest-2.3.4.zip b/pytest-2.3.4.zip deleted file mode 100644 index cc273be..0000000 --- a/pytest-2.3.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5616f744a311c5f5fbb44943aaa41c32df70ba132159a0a9fb6c999060d7645c -size 527214 diff --git a/pytest-2.3.5.tar.gz b/pytest-2.3.5.tar.gz new file mode 100644 index 0000000..f20fea5 --- /dev/null +++ b/pytest-2.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:804c28bef415fc6a54de7934f05b2d67a9cc8a230de98685fca274d9fcbe8b1c +size 426328 diff --git a/python-pytest.changes b/python-pytest.changes index ef0510e..697b8ee 100644 --- a/python-pytest.changes +++ b/python-pytest.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Jun 18 09:42:10 UTC 2013 - speilicke@suse.com + +- Use update-alternatives + +------------------------------------------------------------------- +Mon Jun 17 08:45:18 UTC 2013 - speilicke@suse.com + +- Update to version 2.3.5: + + never consider a fixture function for test function collection + + allow re-running of test items / helps to fix pytest-reruntests plugin + and also help to keep less fixture/resource references alive + + put captured stdout/stderr into junitxml output even for passing tests + (thanks Adam Goucher) + + Issue 265 - integrate nose setup/teardown with setupstate + so it doesnt try to teardown if it did not setup + + issue 271 - dont write junitxml on slave nodes + + Issue 274 - dont try to show full doctest example + when doctest does not know the example location + + issue 280 - disable assertion rewriting on buggy CPython 2.6.0 + + inject "getfixture()" helper to retrieve fixtures from doctests, + thanks Andreas Zeidler + + issue 259 - when assertion rewriting, be consistent with the default + source encoding of ASCII on Python 2 + + issue 251 - report a skip instead of ignoring classes with init + + issue250 unicode/str mixes in parametrization names and values now works + + issue257, assertion-triggered compilation of source ending in a + comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6) + + fix --genscript option to generate standalone scripts that also + work with python3.3 (importer ordering) + + issue171 - in assertion rewriting, show the repr of some + global variables + + fix option help for "-k" + + move long description of distribution into README.rst + + improve docstring for metafunc.parametrize() + + fix bug where using capsys with pytest.set_trace() in a test + function would break when looking at capsys.readouterr() + + allow to specify prefixes starting with "_" when + customizing python_functions test discovery. (thanks Graham Horler) + + improve PYTEST_DEBUG tracing output by puting + extra data on a new lines with additional indent + + ensure OutcomeExceptions like skip/fail have initialized exception attributes + + issue 260 - don't use nose special setup on plain unittest cases + + fix issue134 - print the collect errors that prevent running specified test items + + fix issue266 - accept unicode in MarkEvaluator expressions + ------------------------------------------------------------------- Thu May 2 08:45:19 UTC 2013 - speilicke@suse.com diff --git a/python-pytest.spec b/python-pytest.spec index ebfdbfa..7f63541 100644 --- a/python-pytest.spec +++ b/python-pytest.spec @@ -17,13 +17,14 @@ Name: python-pytest -Version: 2.3.4 +Version: 2.3.5 Release: 0 Summary: Simple powerful testing with Python License: MIT Group: Development/Languages/Python Url: http://pytest.org -Source: http://pypi.python.org/packages/source/p/pytest/pytest-%{version}.zip +Source: http://pypi.python.org/packages/source/p/pytest/pytest-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: unzip # Documentation requirements: @@ -31,7 +32,8 @@ BuildRequires: python-Sphinx # Test requirements: BuildRequires: python-py Requires: python-py -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -62,14 +64,32 @@ python setup.py build_sphinx %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +rm %{buildroot}%{_bindir}/py.test +ln -s %{_bindir}/py.test-%{py_ver} %{buildroot}%{_bindir}/py.test %check python setup.py test +%pre +# Since /usr/bin/py.test became ghosted to be used +# with update-alternatives, we have to get rid of the old binary resulting from the +# non-update-alternativies-ified package: +[[ ! -L %{_bindir}/py.test ]] && rm -f %{_bindir}/py.test +exit 0 + +%post +update-alternatives \ + --install %{_bindir}/py.test py.test %{_bindir}/py.test-%{py_ver} 20 + +%preun +if [ $1 -eq 0 ] ; then + update-alternatives --remove py.test %{_bindir}/py.test-%{py_ver} +fi + %files %defattr(-,root,root,-) -%doc LICENSE README.txt build/sphinx/html -%{_bindir}/py.test +%doc LICENSE README.rst build/sphinx/html +%ghost %{_bindir}/py.test %{_bindir}/py.test-%{py_ver} %{python_sitelib}/* diff --git a/python3-pytest.changes b/python3-pytest.changes deleted file mode 100644 index 9f6c6cf..0000000 --- a/python3-pytest.changes +++ /dev/null @@ -1,5 +0,0 @@ -------------------------------------------------------------------- -Thu May 2 08:44:44 UTC 2013 - speilicke@suse.com - -- Initial version - diff --git a/python3-pytest.spec b/python3-pytest.spec deleted file mode 100644 index 0ec37ea..0000000 --- a/python3-pytest.spec +++ /dev/null @@ -1,72 +0,0 @@ -# -# spec file for package python3-pytest -# -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: python3-pytest -Version: 2.3.4 -Release: 0 -Summary: Simple powerful testing with Python -License: MIT -Group: Development/Languages/Python -Url: http://pytest.org -Source: http://pypi.python.org/packages/source/p/pytest/pytest-%{version}.zip -BuildRequires: python3-devel -BuildRequires: unzip -# Documentation requirements: -BuildRequires: python3-Sphinx -# Test requirements: -BuildRequires: python3-py -Requires: python3-py -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -pytest helps you write better programs. It is a a mature full-featured, -cross-project Python testing tool. It provides: - -* auto-discovery of test modules and functions, -* detailed info on failing assert statements (no need to remember - self.assert* names), -* modular fixtures for managing small or parametrized long-lived test resources. -* multi-paradigm support: you can use py.test to run test suites based on - unittest (or trial), nose, -* single-source compatibility to Python2.4 all the way up to Python3.3, - PyPy-1.9 and Jython-2.5.1, and -* many external plugins. - - -%prep -%setup -q -n pytest-%{version} - -%build -python3 setup.py build -python3 setup.py build_sphinx - -%install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -# Drop unversioned binary, collides with py2 pkg, maybe update-alternatives? -rm %{buildroot}%{_bindir}/py.test - -%check -python3 setup.py test - -%files -%defattr(-,root,root,-) -%doc LICENSE README.txt build/sphinx/html -%{_bindir}/py.test-%{py3_ver} -%{python3_sitelib}/* - -%changelog