Hello community, here is the log from the commit of package python-detox for openSUSE:Factory checked in at 2015-05-11 19:38:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-detox (Old) and /work/SRC/openSUSE:Factory/.python-detox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-detox" Changes: -------- --- /work/SRC/openSUSE:Factory/python-detox/python-detox.changes 2014-08-06 15:32:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-detox.new/python-detox.changes 2015-05-11 19:48:41.000000000 +0200 @@ -1,0 +2,11 @@ +Sat May 2 19:12:34 UTC 2015 - [email protected] + +- update to version 0.9.4: + * get compatible again to eventlet by avoiding to import + eventlet.processes, thanks Takeshi Komiya for the PR. + * make detox honor skipsdist. Thanks Timoth Messier for the PR. + * change license to MIT +- change license to match upstream +- increase required versions for eventlet and tox + +------------------------------------------------------------------- Old: ---- detox-0.9.3.tar.gz New: ---- detox-0.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-detox.spec ++++++ --- /var/tmp/diff_new_pack.fdz0bW/_old 2015-05-11 19:48:42.000000000 +0200 +++ /var/tmp/diff_new_pack.fdz0bW/_new 2015-05-11 19:48:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-detox # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,27 +13,28 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: python-detox -Version: 0.9.3 +Version: 0.9.4 Release: 0 -License: AGPL-3.0 Summary: Distributing activities of the tox tool -Url: http://bitbucket.org/hpk42/detox +License: MIT Group: Development/Languages/Python +Url: http://bitbucket.org/hpk42/detox Source: https://pypi.python.org/packages/source/d/detox/detox-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools # Test requirements: -BuildRequires: python-eventlet >= 0.9.16 +BuildRequires: python-eventlet >= 0.15.0 BuildRequires: python-nose BuildRequires: python-py >= 1.4.13 BuildRequires: python-pytest -BuildRequires: python-tox >= 1.4.3 -Requires: python-eventlet >= 0.9.16 +BuildRequires: python-tox >= 1.9.0 +Requires: python-eventlet >= 0.15.0 Requires: python-py >= 1.4.13 -Requires: python-tox >= 1.4.3 +Requires: python-tox >= 1.9.0 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()")} ++++++ detox-0.9.3.tar.gz -> detox-0.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/CHANGELOG new/detox-0.9.4/CHANGELOG --- old/detox-0.9.3/CHANGELOG 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/CHANGELOG 2015-02-24 15:51:26.000000000 +0100 @@ -1,3 +1,13 @@ +0.9.4 +----------------------- + +- get compatible again to eventlet by avoiding to import + eventlet.processes, thanks Takeshi Komiya for the PR. + +- make detox honor skipsdist. Thanks Timoth Messier for the PR. + +- change license to MIT + 0.9.3 ----------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/LICENSE new/detox-0.9.4/LICENSE --- old/detox-0.9.3/LICENSE 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/LICENSE 2015-02-24 15:51:26.000000000 +0100 @@ -1,2 +1,19 @@ -AGPLV3 (Affero Gnu Public License version 3) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/PKG-INFO new/detox-0.9.4/PKG-INFO --- old/detox-0.9.3/PKG-INFO 2013-09-04 16:18:06.000000000 +0200 +++ new/detox-0.9.4/PKG-INFO 2015-02-24 15:51:27.000000000 +0100 @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: detox -Version: 0.9.3 -Summary: distributing activities of the tox tool +Version: 0.9.4 +Summary: distributing activities of the tox tool (py2 only) Home-page: http://bitbucket.org/hpk42/detox Author: holger krekel Author-email: holger at merlinux.eu -License: AGPL3 +License: MIT Description: What is detox? ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/detox/__init__.py new/detox-0.9.4/detox/__init__.py --- old/detox-0.9.3/detox/__init__.py 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/detox/__init__.py 2015-02-24 15:51:26.000000000 +0100 @@ -1 +1 @@ -__version__ = '0.9.3' +__version__ = '0.9.4' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/detox/proc.py new/detox-0.9.4/detox/proc.py --- old/detox-0.9.3/detox/proc.py 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/detox/proc.py 2015-02-24 15:51:26.000000000 +0100 @@ -3,7 +3,6 @@ import eventlet import sys import py -from eventlet.processes import Process, DeadProcess from eventlet.timeout import Timeout from eventlet.green.subprocess import Popen, PIPE, STDOUT from eventlet import GreenPool @@ -136,11 +135,16 @@ if self.toxsession.config.option.sdistonly: self._sdistpath = self.getresources("sdist") return - venv, sdist = self.getresources("venv:%s" % venvname, "sdist") - self._sdistpath = sdist - if venv and sdist: - if self.toxsession.installpkg(venv, sdist): + if self.toxsession.config.skipsdist: + venv, = self.getresources("venv:%s" % venvname) + if venv: self.toxsession.runtestenv(venv, redirect=True) + else: + venv, sdist = self.getresources("venv:%s" % venvname, "sdist") + self._sdistpath = sdist + if venv and sdist: + if self.toxsession.installpkg(venv, sdist): + self.toxsession.runtestenv(venv, redirect=True) def runtestsmulti(self, envlist): pool = GreenPool() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/detox.egg-info/PKG-INFO new/detox-0.9.4/detox.egg-info/PKG-INFO --- old/detox-0.9.3/detox.egg-info/PKG-INFO 2013-09-04 16:18:06.000000000 +0200 +++ new/detox-0.9.4/detox.egg-info/PKG-INFO 2015-02-24 15:51:27.000000000 +0100 @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: detox -Version: 0.9.3 -Summary: distributing activities of the tox tool +Version: 0.9.4 +Summary: distributing activities of the tox tool (py2 only) Home-page: http://bitbucket.org/hpk42/detox Author: holger krekel Author-email: holger at merlinux.eu -License: AGPL3 +License: MIT Description: What is detox? ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/detox.egg-info/requires.txt new/detox-0.9.4/detox.egg-info/requires.txt --- old/detox-0.9.3/detox.egg-info/requires.txt 2013-09-04 16:18:06.000000000 +0200 +++ new/detox-0.9.4/detox.egg-info/requires.txt 2015-02-24 15:51:27.000000000 +0100 @@ -1,3 +1,3 @@ -tox>=1.6.1 +tox>=1.9.0 py>=1.4.13 -eventlet>=0.9.16 \ No newline at end of file +eventlet>=0.15.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/setup.py new/detox-0.9.4/setup.py --- old/detox-0.9.3/setup.py 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/setup.py 2015-02-24 15:51:26.000000000 +0100 @@ -30,11 +30,11 @@ def main(): setup( name='detox', - description='distributing activities of the tox tool', + description='distributing activities of the tox tool (py2 only)', long_description = long_description, - version='0.9.3', + version='0.9.4', url='http://bitbucket.org/hpk42/detox', - license='AGPL3', + license='MIT', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', author_email='holger at merlinux.eu', @@ -50,8 +50,8 @@ 'Programming Language :: Python', ], packages=['detox', ], - install_requires=['tox>=1.6.1', - 'py>=1.4.13', 'eventlet>=0.9.16',], + install_requires=['tox>=1.9.0', + 'py>=1.4.13', 'eventlet>=0.15.0',], entry_points={'console_scripts': 'detox=detox.main:main'}, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/tests/conftest.py new/detox-0.9.4/tests/conftest.py --- old/detox-0.9.3/tests/conftest.py 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/tests/conftest.py 2015-02-24 15:51:26.000000000 +0100 @@ -33,8 +33,20 @@ """)) tmpdir.join("example1", "__init__.py").ensure() + +def create_example2(tmpdir): + tmpdir.join("tox.ini").write(d(""" + [tox] + skipsdist = True + + [testenv:py] + """)) + tmpdir.join("example2", "__init__.py").ensure() + + def pytest_configure(config): config.addinivalue_line("markers", "example1: use example1 for setup") + config.addinivalue_line("markers", "example2: use example2 for setup") config.addinivalue_line("markers", "timeout(N): stop test function " "after N seconds, throwing a Timeout.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/tests/test_detox.py new/detox-0.9.4/tests/test_detox.py --- old/detox-0.9.3/tests/test_detox.py 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/tests/test_detox.py 2015-02-24 15:51:26.000000000 +0100 @@ -71,6 +71,12 @@ def test_test(self, detox): detox.runtests("py") +class TestDetoxExample2: + pytestmark = [pytest.mark.example2, pytest.mark.timeout(20)] + + def test_test(self, detox): + detox.runtests("py") + class TestCmdline: pytestmark = [pytest.mark.example1] @pytest.mark.timeout(20) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.3/tox.ini new/detox-0.9.4/tox.ini --- old/detox-0.9.3/tox.ini 2013-09-04 16:18:05.000000000 +0200 +++ new/detox-0.9.4/tox.ini 2015-02-24 15:51:26.000000000 +0100 @@ -1,8 +1,5 @@ [tox] envlist=py26,py27 -indexserver = - testrun = http://pypi.testrun.org - pypi = http://pypi.python.org/simple [testenv] commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
