Hello community, here is the log from the commit of package python-pytest-xvfb for openSUSE:Factory checked in at 2020-08-25 12:40:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-xvfb (Old) and /work/SRC/openSUSE:Factory/.python-pytest-xvfb.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-xvfb" Tue Aug 25 12:40:06 2020 rev:6 rq:828446 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-xvfb/python-pytest-xvfb.changes 2020-05-28 09:09:18.660022816 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytest-xvfb.new.3399/python-pytest-xvfb.changes 2020-08-25 12:40:38.149435599 +0200 @@ -1,0 +2,9 @@ +Thu Aug 20 13:21:30 UTC 2020 - John Vandenberg <[email protected]> + +- Update to v2.0.0: + * PyVirtualDisplay 1.3 and newer is now supported, support for older versions was dropped. + * Support for Python 2.7, 3.3 and 3.4 is now dropped. + * Support for Python 3.6, 3.7 and 3.8 was added (no code changes required). + * Xvfb is now not started anymore in the xdist master process. + +------------------------------------------------------------------- Old: ---- pytest-xvfb-1.2.0.tar.gz New: ---- LICENSE pytest-xvfb-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-xvfb.spec ++++++ --- /var/tmp/diff_new_pack.UJBeCH/_old 2020-08-25 12:40:39.649435882 +0200 +++ /var/tmp/diff_new_pack.UJBeCH/_new 2020-08-25 12:40:39.653435883 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pytest-xvfb # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 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 @@ -18,19 +18,21 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-xvfb -Version: 1.2.0 +Version: 2.0.0 Release: 0 Summary: Pytest plugin to run Xvfb for tests License: MIT URL: https://github.com/The-Compiler/pytest-xvfb Source: https://files.pythonhosted.org/packages/source/p/pytest-xvfb/pytest-xvfb-%{version}.tar.gz -BuildRequires: %{python_module PyVirtualDisplay >= 0.2.1} +# https://github.com/The-Compiler/pytest-xvfb/pull/26 +Source1: https://raw.githubusercontent.com/The-Compiler/pytest-xvfb/master/LICENSE +BuildRequires: %{python_module PyVirtualDisplay >= 0.3} BuildRequires: %{python_module pytest >= 2.8.1} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: xvfb-run -Requires: python-PyVirtualDisplay >= 0.2.1 +Requires: python-PyVirtualDisplay >= 0.3 Requires: python-pytest >= 2.8.1 Requires: xdpyinfo Recommends: xorg-x11-server @@ -54,6 +56,8 @@ %prep %setup -q -n pytest-xvfb-%{version} +rm tests/test_xvfb_windows.py +cp %{SOURCE1} . %build %python_build ++++++ LICENSE ++++++ The MIT License (MIT) Copyright (c) 2016 Florian Bruhin 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. ++++++ pytest-xvfb-1.2.0.tar.gz -> pytest-xvfb-2.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/.gitignore new/pytest-xvfb-2.0.0/.gitignore --- old/pytest-xvfb-1.2.0/.gitignore 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -/.cache -/*.egg-info -/__pycache__ -/.tox -/dist -/htmlcov -/coverage.xml -/.coverage -*.pyc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/.travis.yml new/pytest-xvfb-2.0.0/.travis.yml --- old/pytest-xvfb-1.2.0/.travis.yml 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -# Config file for automatic testing at travis-ci.org - -sudo: false -language: python -python: - - "2.7" - - "3.3" - - "3.4" - - "3.5" - - "pypy" - -addons: - apt: - packages: - - xvfb - - xauth - -install: - - pip install tox - - "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}" -script: tox -e $TOX_ENV - -before_cache: - - rm -rf $HOME/.cache/pip/log -cache: - directories: - - $HOME/.cache/pip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/CHANGELOG.rst new/pytest-xvfb-2.0.0/CHANGELOG.rst --- old/pytest-xvfb-1.2.0/CHANGELOG.rst 2019-01-06 22:29:49.000000000 +0100 +++ new/pytest-xvfb-2.0.0/CHANGELOG.rst 2020-06-09 19:16:09.000000000 +0200 @@ -1,6 +1,15 @@ pytest-xvfb changelog ===================== +v2.0.0 +------ + +- PyVirtualDisplay 1.3 and newer is now supported, support for older versions + was dropped. +- Support for Python 2.7, 3.3 and 3.4 is now dropped. +- Support for Python 3.6, 3.7 and 3.8 was added (no code changes required). +- Xvfb is now not started anymore in the xdist master process. + v1.2.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/LICENSE new/pytest-xvfb-2.0.0/LICENSE --- old/pytest-xvfb-1.2.0/LICENSE 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Florian Bruhin - -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/pytest-xvfb-1.2.0/PKG-INFO new/pytest-xvfb-2.0.0/PKG-INFO --- old/pytest-xvfb-1.2.0/PKG-INFO 2019-01-07 10:12:39.000000000 +0100 +++ new/pytest-xvfb-2.0.0/PKG-INFO 2020-06-09 19:16:19.892358800 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: pytest-xvfb -Version: 1.2.0 +Version: 2.0.0 Summary: A pytest plugin to run Xvfb for tests. Home-page: https://github.com/The-Compiler/pytest-xvfb Author: Florian Bruhin @@ -107,13 +107,14 @@ Classifier: Intended Audience :: Developers Classifier: Topic :: Software Development :: Testing Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Operating System :: OS Independent Classifier: License :: OSI Approved :: MIT License +Requires-Python: >=3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/appveyor.yml new/pytest-xvfb-2.0.0/appveyor.yml --- old/pytest-xvfb-1.2.0/appveyor.yml 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -# What Python version is installed where: -# http://www.appveyor.com/docs/installed-software#python - -environment: - matrix: - - PYTHON: "C:\\Python27" - TOX_ENV: "py27" - - - PYTHON: "C:\\Python33" - TOX_ENV: "py33" - - - PYTHON: "C:\\Python34" - TOX_ENV: "py34" - - - PYTHON: "C:\\Python35" - TOX_ENV: "py35" - - -init: - - "%PYTHON%/python -V" - - "%PYTHON%/python -c \"import struct;print( 8 * struct.calcsize(\'P\'))\"" - -install: - - "%PYTHON%/Scripts/easy_install -U pip" - - "%PYTHON%/Scripts/pip install tox" - - "%PYTHON%/Scripts/pip install wheel" - -build: false # Not a C# project, build stuff at the test step instead. - -test_script: - - "%PYTHON%/Scripts/tox -e %TOX_ENV% -- tests/test_xvfb_windows.py" - -after_test: - - "%PYTHON%/python setup.py bdist_wheel" - - ps: "ls dist" - -artifacts: - - path: dist\* - -#on_success: -# - TODO: upload the content of dist/*.whl to a public wheelhouse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/pytest.ini new/pytest-xvfb-2.0.0/pytest.ini --- old/pytest-xvfb-1.2.0/pytest.ini 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/pytest.ini 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[pytest] -addopts = --runpytest=subprocess diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/PKG-INFO new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/PKG-INFO --- old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/PKG-INFO 2019-01-07 10:12:38.000000000 +0100 +++ new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/PKG-INFO 2020-06-09 19:16:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: pytest-xvfb -Version: 1.2.0 +Version: 2.0.0 Summary: A pytest plugin to run Xvfb for tests. Home-page: https://github.com/The-Compiler/pytest-xvfb Author: Florian Bruhin @@ -107,13 +107,14 @@ Classifier: Intended Audience :: Developers Classifier: Topic :: Software Development :: Testing Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Operating System :: OS Independent Classifier: License :: OSI Approved :: MIT License +Requires-Python: >=3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/SOURCES.txt new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/SOURCES.txt --- old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/SOURCES.txt 2019-01-07 10:12:38.000000000 +0100 +++ new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/SOURCES.txt 2020-06-09 19:16:19.000000000 +0200 @@ -1,14 +1,8 @@ -.gitignore -.travis.yml CHANGELOG.rst -LICENSE MANIFEST.in README.rst -appveyor.yml -pytest.ini pytest_xvfb.py setup.py -tox.ini pytest_xvfb.egg-info/PKG-INFO pytest_xvfb.egg-info/SOURCES.txt pytest_xvfb.egg-info/dependency_links.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/requires.txt new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/requires.txt --- old/pytest-xvfb-1.2.0/pytest_xvfb.egg-info/requires.txt 2019-01-07 10:12:38.000000000 +0100 +++ new/pytest-xvfb-2.0.0/pytest_xvfb.egg-info/requires.txt 2020-06-09 19:16:19.000000000 +0200 @@ -1,2 +1,2 @@ pytest>=2.8.1 -pyvirtualdisplay>=0.2.1 +pyvirtualdisplay>=1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/pytest_xvfb.py new/pytest-xvfb-2.0.0/pytest_xvfb.py --- old/pytest-xvfb-1.2.0/pytest_xvfb.py 2019-01-06 17:37:59.000000000 +0100 +++ new/pytest-xvfb-2.0.0/pytest_xvfb.py 2020-06-09 19:16:09.000000000 +0200 @@ -15,6 +15,13 @@ import pytest +def is_xdist_master(config): + return ( + config.getoption("dist", "no") != "no" and + not os.environ.get("PYTEST_XDIST_WORKER") + ) + + def xvfb_available(): # http://stackoverflow.com/a/28909933/2085149 return any( @@ -42,23 +49,15 @@ def start(self): self._virtual_display = pyvirtualdisplay.Display( backend='xvfb', size=(self.width, self.height), - color_depth=self.colordepth, use_xauth=self.xauth) - self._virtual_display.cmd.extend(self.args) + color_depth=self.colordepth, use_xauth=self.xauth, + extra_args=self.args) self._virtual_display.start() self.display = self._virtual_display.display - - if not self._virtual_display.is_alive(): - ret = self._virtual_display.return_code - self._virtual_display.wait() # collect outputs - stdout = self._virtual_display.stdout - stderr = self._virtual_display.stderr - raise XvfbExitedError("Xvfb exited with exit code {0}\nXvfb stdout:\n {1}\nXvfb stderr:\n {2}".format( - ret, - '\n '.join(stdout.splitlines()), - '\n '.join(stderr.splitlines()))) + assert self._virtual_display.is_alive() def stop(self): - self._virtual_display.stop() + if self.display is not None: # starting worked + self._virtual_display.stop() def pytest_addoption(parser): @@ -81,11 +80,12 @@ def pytest_configure(config): - if config.getoption('--no-xvfb') or not xvfb_available(): + no_xvfb = config.getoption('--no-xvfb') or is_xdist_master(config) + if no_xvfb or not xvfb_available(): config.xvfb = None if (sys.platform.startswith('linux') and 'DISPLAY' in os.environ - and not config.getoption('--no-xvfb')): + and not no_xvfb): print('pytest-xvfb could not find Xvfb. ' 'You can install it to prevent windows from being shown.') else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/setup.py new/pytest-xvfb-2.0.0/setup.py --- old/pytest-xvfb-1.2.0/setup.py 2019-01-06 22:30:28.000000000 +0100 +++ new/pytest-xvfb-2.0.0/setup.py 2020-06-09 19:16:09.000000000 +0200 @@ -13,7 +13,7 @@ setup( name='pytest-xvfb', - version='1.2.0', + version='2.0.0', author='Florian Bruhin', author_email='[email protected]', maintainer='Florian Bruhin', @@ -23,18 +23,19 @@ description='A pytest plugin to run Xvfb for tests.', long_description=read('README.rst'), py_modules=['pytest_xvfb'], - install_requires=['pytest>=2.8.1', 'pyvirtualdisplay>=0.2.1'], + install_requires=['pytest>=2.8.1', 'pyvirtualdisplay>=1.3'], + python_requires='>=3.5', classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'Topic :: Software Development :: Testing', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Operating System :: OS Independent', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/tests/test_xvfb.py new/pytest-xvfb-2.0.0/tests/test_xvfb.py --- old/pytest-xvfb-1.2.0/tests/test_xvfb.py 2017-12-04 10:41:47.000000000 +0100 +++ new/pytest-xvfb-2.0.0/tests/test_xvfb.py 2020-06-09 19:16:09.000000000 +0200 @@ -122,10 +122,7 @@ """) result = testdir.runpytest() result.stderr.fnmatch_lines([ - "INTERNALERROR> *XvfbExitedError: Xvfb exited with exit code 1", - "INTERNALERROR> Xvfb stdout:", - "INTERNALERROR> Xvfb stderr:", - "INTERNALERROR> Unrecognized option: -foo", + "INTERNALERROR> *.XStartError: Xvfb program closed. *", ]) assert 'OSError' not in str(result.stderr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-xvfb-1.2.0/tox.ini new/pytest-xvfb-2.0.0/tox.ini --- old/pytest-xvfb-1.2.0/tox.ini 2017-02-19 22:23:50.000000000 +0100 +++ new/pytest-xvfb-2.0.0/tox.ini 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# For more information about tox, see https://tox.readthedocs.org/en/latest/ -[tox] -envlist = py27,py33,py34,py35,pypy - -[testenv] -deps = - pytest - pyvirtualdisplay -commands = py.test {posargs:tests}
