Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-cheroot for openSUSE:Factory checked in at 2022-11-17 17:23:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cheroot (Old) and /work/SRC/openSUSE:Factory/.python-cheroot.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cheroot" Thu Nov 17 17:23:46 2022 rev:20 rq:1036180 version:8.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cheroot/python-cheroot.changes 2022-04-05 19:54:53.930604577 +0200 +++ /work/SRC/openSUSE:Factory/.python-cheroot.new.1597/python-cheroot.changes 2022-11-17 17:23:52.440865317 +0100 @@ -1,0 +2,12 @@ +Wed Nov 16 08:58:31 UTC 2022 - Daniel Garcia <[email protected]> + +- Remove python_module macro definition +- Disable broken tests https://github.com/cherrypy/cheroot/issues/511 + +------------------------------------------------------------------- +Wed May 11 16:26:15 UTC 2022 - Matej Cepl <[email protected]> + +- Add no-relative-imports.patch to work around seriously broken + system of imports. + +------------------------------------------------------------------- New: ---- no-relative-imports.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cheroot.spec ++++++ --- /var/tmp/diff_new_pack.Vu89M7/_old 2022-11-17 17:23:52.972868131 +0100 +++ /var/tmp/diff_new_pack.Vu89M7/_new 2022-11-17 17:23:52.976868153 +0100 @@ -22,7 +22,6 @@ %bcond_with libalternatives %endif -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define pypi_name cheroot %bcond_without python2 %bcond_with ringdisabled @@ -36,6 +35,8 @@ # PATCH-FIX-OPENSUSE no-pypytools.patch [email protected] # We don't have PyPy at all, so no need support for it Patch0: no-pypytools.patch +# PATCH-FIX-UPSTREAM no-relative-imports.patch bsc#[0-9]+ [email protected] +Patch1: no-relative-imports.patch BuildRequires: %{python_module jaraco.functools} BuildRequires: %{python_module more-itertools >= 2.6} BuildRequires: %{python_module setuptools >= 34.4} @@ -93,7 +94,7 @@ %prep %autosetup -p1 -n cheroot-%{version} -p1 # do not check coverage -sed -i '/--cov/ d' pytest.ini +sed -i -e '/--cov/ d' pytest.ini %build %python_build @@ -113,8 +114,9 @@ %endif # test_tls_client_auth[...-False-localhost-builtin] fails ocassionally on server-side OBS donttest="(test_tls_client_auth and False-localhost-builtin)" -# https://github.com/cherrypy/cheroot/issues/502 -donttest="$donttest or test_high_number_of_file_descriptors" +# looks like there's a bug with pytest.mark.forked +# https://github.com/cherrypy/cheroot/issues/511 +donttest+=" or test_high_number_of_file_descriptor" %pytest --pyargs cheroot $pytest_opts -k "not ($donttest)" popd ++++++ no-relative-imports.patch ++++++ --- cheroot/ssl/builtin.py | 10 +++++----- cheroot/test/conftest.py | 6 +++--- cheroot/test/test_server.py | 8 ++++---- cheroot/test/test_ssl.py | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) --- a/cheroot/ssl/builtin.py +++ b/cheroot/ssl/builtin.py @@ -29,11 +29,11 @@ except ImportError: import six -from . import Adapter -from .. import errors -from .._compat import IS_ABOVE_OPENSSL10, suppress -from ..makefile import StreamReader, StreamWriter -from ..server import HTTPServer +from cheroot.ssl import Adapter +from cheroot import errors +from cheroot._compat import IS_ABOVE_OPENSSL10, suppress +from cheroot.makefile import StreamReader, StreamWriter +from cheroot.server import HTTPServer if six.PY2: generic_socket_error = socket.error --- a/cheroot/test/conftest.py +++ b/cheroot/test/conftest.py @@ -12,11 +12,11 @@ import time import pytest -from ..server import Gateway, HTTPServer -from ..testing import ( # noqa: F401 # pylint: disable=unused-import +from cheroot.server import Gateway, HTTPServer +from cheroot.testing import ( # noqa: F401 # pylint: disable=unused-import native_server, wsgi_server, ) -from ..testing import get_server_client +from cheroot.testing import get_server_client @pytest.fixture --- a/cheroot/test/test_server.py +++ b/cheroot/test/test_server.py @@ -18,10 +18,10 @@ import six from six.moves import queue, urllib -from .._compat import bton, ntob -from .._compat import IS_LINUX, IS_MACOS, IS_WINDOWS, SYS_PLATFORM -from ..server import IS_UID_GID_RESOLVABLE, Gateway, HTTPServer -from ..testing import ( +from cheroot._compat import bton, ntob +from cheroot._compat import IS_LINUX, IS_MACOS, IS_WINDOWS, SYS_PLATFORM +from cheroot.server import IS_UID_GID_RESOLVABLE, Gateway, HTTPServer +from cheroot.testing import ( ANY_INTERFACE_IPV4, ANY_INTERFACE_IPV6, EPHEMERAL_PORT, --- a/cheroot/test/test_ssl.py +++ b/cheroot/test/test_ssl.py @@ -21,11 +21,11 @@ import requests import six import trustme -from .._compat import bton, ntob, ntou -from .._compat import IS_ABOVE_OPENSSL10, IS_CI, IS_PYPY -from .._compat import IS_LINUX, IS_MACOS, IS_WINDOWS -from ..server import HTTPServer, get_ssl_adapter_class -from ..testing import ( +from cheroot._compat import bton, ntob, ntou +from cheroot._compat import IS_ABOVE_OPENSSL10, IS_CI, IS_PYPY +from cheroot._compat import IS_LINUX, IS_MACOS, IS_WINDOWS +from cheroot.server import HTTPServer, get_ssl_adapter_class +from cheroot.testing import ( ANY_INTERFACE_IPV4, ANY_INTERFACE_IPV6, EPHEMERAL_PORT, @@ -33,7 +33,7 @@ from ..testing import ( _get_conn_data, _probe_ipv6_sock, ) -from ..wsgi import Gateway_10 +from cheroot.wsgi import Gateway_10 IS_GITHUB_ACTIONS_WORKFLOW = bool(os.getenv('GITHUB_WORKFLOW'))
