Hello community,

here is the log from the commit of package python-tox for openSUSE:Factory 
checked in at 2014-07-11 06:45:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-tox (Old)
 and      /work/SRC/openSUSE:Factory/.python-tox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-tox"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-tox/python-tox.changes    2013-09-23 
11:17:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-tox.new/python-tox.changes       
2014-07-11 06:45:39.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jul  3 11:13:09 UTC 2014 - speili...@suse.com
+
+- Update to version 1.7.1:
+  - fix issue162: don't list python 2.5 as compatibiliy/supported
+  - fix issue158 and fix issue155: windows/virtualenv properly works now:
+    call virtualenv through "python -m virtualenv" with the same 
+    interpreter which invoked tox.  Thanks Chris Withers, Ionel Maries 
Cristian.
+- Add tox-disable-env-tests.patch: Disable tests that need network-access
+  and that depend on /usr/bin/tox (which is only added via u-a in %post)
+- Remove tox-disable-network-accessing-tests.patch: Obsoleted by the above 
patch
+- Implement update-alternatives to allow parallel installation with python3-tox
+
+-------------------------------------------------------------------

Old:
----
  tox-1.6.1.tar.gz
  tox-disable-network-accessing-tests.patch

New:
----
  tox-1.7.1.tar.gz
  tox-disable-env-tests.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-tox.spec ++++++
--- /var/tmp/diff_new_pack.0th9h0/_old  2014-07-11 06:45:40.000000000 +0200
+++ /var/tmp/diff_new_pack.0th9h0/_new  2014-07-11 06:45:40.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package python-tox
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,29 +17,32 @@
 
 
 Name:           python-tox
-Version:        1.6.1
+Version:        1.7.1
 Release:        0
 Summary:        Virtualenv-based automation of test activities
 License:        MIT
 Group:          Development/Languages/Python
 Url:            http://codespeak.net/tox
 Source:         
http://pypi.python.org/packages/source/t/tox/tox-%{version}.tar.gz
-Patch0:         tox-disable-network-accessing-tests.patch
+# PATCH-FIX-OPENSUSE speili...@suse.com -- Due to update-alternative usage, 
some bianries aren't available at build-time
+Patch0:         tox-disable-env-tests.patch
 BuildRequires:  python-devel
 # Documentation requirements:
 BuildRequires:  python-Sphinx
 # Test requirements:
-BuildRequires:  python-argparse
-BuildRequires:  python-py >= 1.4.9
+BuildRequires:  python-pip
+BuildRequires:  python-py >= 1.4.17
 BuildRequires:  python-pytest >= 2.3.5
-BuildRequires:  python-virtualenv
+BuildRequires:  python-virtualenv >= 1.11.2
 BuildRequires:  unzip
-Requires:       python-argparse
-Requires:       python-py
-Requires:       python-virtualenv
+Requires:       python-py >= 1.4.17
+Requires:       python-virtualenv >= 1.11.2
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %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()")}
+BuildRequires:  python-argparse
 Requires:       python-argparse
 %else
 BuildArch:      noarch
@@ -63,6 +66,8 @@
 %setup -q -n tox-%{version}
 %patch0 -p1
 sed -i -e "/^\\[testenv\\]/ a\\sitepackages = True" tox.ini
+sed -i -e "s/tox=tox:cmdline/tox-%{py_ver}=tox:cmdline/" \
+       -e 
"s/tox-quickstart=tox._quickstart:main/tox-quickstart-%{py_ver}=tox._quickstart:main/"
 setup.py
 
 %build
 python setup.py build
@@ -70,14 +75,35 @@
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+for B in tox tox-quickstart ; do
+  touch %{buildroot}%{_sysconfdir}/alternatives/$B
+  ln -sf %{_sysconfdir}/alternatives/$B %{buildroot}/%{_bindir}/$B
+done
 
 %check
-PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python_sitelib}/ 
python setup.py test
+PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python_sitelib}/ 
py.test
+
+%post
+update-alternatives \
+    --install %{_bindir}/tox tox %{_bindir}/tox-%{py_ver} 20 \
+    --slave %{_bindir}/tox-quickstart tox-quickstart 
%{_bindir}/tox-quickstart-%{py_ver}
+
+%postun
+if [ $1 -eq 0 ] ; then
+    update-alternatives --remove tox %{_bindir}/tox-%{py_ver}
+fi
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README.rst doc/_build/html
-%{_bindir}/*
-%{python_sitelib}/*
+%{_bindir}/tox
+%{_bindir}/tox-%{py_ver}
+%ghost %{_sysconfdir}/alternatives/tox
+%{_bindir}/tox-quickstart
+%{_bindir}/tox-quickstart-%{py_ver}
+%ghost %{_sysconfdir}/alternatives/tox-quickstart
+%{python_sitelib}/tox-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/tox
 
 %changelog

++++++ tox-1.6.1.tar.gz -> tox-1.7.1.tar.gz ++++++
++++ 4735 lines of diff (skipped)

++++++ tox-disable-env-tests.patch ++++++
++++ 749 lines (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to