diff --git a/cheroot-10.0.0.tar.gz b/cheroot-10.0.0.tar.gz new file mode 100644 index 0000000..e8bc2e1 --- /dev/null +++ b/cheroot-10.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59c4a1877fef9969b3c3c080caaaf377e2780919437853fc0d32a9df40b311f0 +size 148461 diff --git a/cheroot-9.0.0.tar.gz b/cheroot-9.0.0.tar.gz deleted file mode 100644 index 2762f2b..0000000 --- a/cheroot-9.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d47ad9ee19ecbec144b4758399036692fdbf67a40b96eef1fb1454367b3d338 -size 152562 diff --git a/no-relative-imports.patch b/no-relative-imports.patch index a6d10e9..046b221 100644 --- a/no-relative-imports.patch +++ b/no-relative-imports.patch @@ -5,10 +5,10 @@ cheroot/test/test_ssl.py | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) -Index: cheroot-9.0.0/cheroot/ssl/builtin.py +Index: cheroot-10.0.0/cheroot/ssl/builtin.py =================================================================== ---- cheroot-9.0.0.orig/cheroot/ssl/builtin.py -+++ cheroot-9.0.0/cheroot/ssl/builtin.py +--- cheroot-10.0.0.orig/cheroot/ssl/builtin.py ++++ cheroot-10.0.0/cheroot/ssl/builtin.py @@ -25,11 +25,11 @@ except ImportError: except ImportError: DEFAULT_BUFFER_SIZE = -1 @@ -26,10 +26,10 @@ Index: cheroot-9.0.0/cheroot/ssl/builtin.py generic_socket_error = OSError -Index: cheroot-9.0.0/cheroot/test/conftest.py +Index: cheroot-10.0.0/cheroot/test/conftest.py =================================================================== ---- cheroot-9.0.0.orig/cheroot/test/conftest.py -+++ cheroot-9.0.0/cheroot/test/conftest.py +--- cheroot-10.0.0.orig/cheroot/test/conftest.py ++++ cheroot-10.0.0/cheroot/test/conftest.py @@ -9,12 +9,12 @@ import time import pytest @@ -47,29 +47,31 @@ Index: cheroot-9.0.0/cheroot/test/conftest.py @pytest.fixture -Index: cheroot-9.0.0/cheroot/test/test_server.py +Index: cheroot-10.0.0/cheroot/test/test_server.py =================================================================== ---- cheroot-9.0.0.orig/cheroot/test/test_server.py -+++ cheroot-9.0.0/cheroot/test/test_server.py -@@ -12,10 +12,10 @@ import pytest +--- cheroot-10.0.0.orig/cheroot/test/test_server.py ++++ cheroot-10.0.0/cheroot/test/test_server.py +@@ -13,11 +13,11 @@ import pytest import requests import requests_unixsocket -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 ..workers.threadpool import ThreadPool -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.workers.threadpool import ThreadPool +from cheroot.testing import ( ANY_INTERFACE_IPV4, ANY_INTERFACE_IPV6, EPHEMERAL_PORT, -Index: cheroot-9.0.0/cheroot/test/test_ssl.py +Index: cheroot-10.0.0/cheroot/test/test_ssl.py =================================================================== ---- cheroot-9.0.0.orig/cheroot/test/test_ssl.py -+++ cheroot-9.0.0/cheroot/test/test_ssl.py +--- cheroot-10.0.0.orig/cheroot/test/test_ssl.py ++++ cheroot-10.0.0/cheroot/test/test_ssl.py @@ -16,11 +16,11 @@ import pytest import requests import trustme diff --git a/python-cheroot-no-six.patch b/python-cheroot-no-six.patch deleted file mode 100644 index 664d9ea..0000000 --- a/python-cheroot-no-six.patch +++ /dev/null @@ -1,22 +0,0 @@ -index 8ff3b02ced..b4030da6fd 100644 ---- a/cheroot/test/_pytest_plugin.py -+++ b/cheroot/test/_pytest_plugin.py -@@ -8,7 +8,6 @@ - __metaclass__ = type - - import pytest --import six - - - pytest_version = tuple(map(int, pytest.__version__.split('.'))) -@@ -46,9 +45,6 @@ def pytest_load_initial_conftests(early_config, parser, args): - 'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception', - )) - -- if six.PY2: -- return -- - # NOTE: `ResourceWarning` does not exist under Python 2 and so using - # NOTE: it in warning filters results in an `_OptionError` exception - # NOTE: being raised. - diff --git a/python-cheroot.changes b/python-cheroot.changes index fe01c2f..c202460 100644 --- a/python-cheroot.changes +++ b/python-cheroot.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 29 18:07:41 UTC 2023 - Dirk Müller + +- update to 10.0.0: + * Cheroot now accepts a ``reuse_port`` parameter on the + ``HTTPServer`` object. + * Subclasses overriding ``prepare_socket`` will no longer + work and will need to adapt to the new interface. +- drop python-cheroot-no-six.patch (upstream) + ------------------------------------------------------------------- Sat Jun 10 09:22:04 UTC 2023 - ecsos @@ -102,7 +112,7 @@ Mon Mar 29 17:49:02 UTC 2021 - Ben Greiner * only remove coverage options from pytest.ini * don't skip tests which had failed 2 years ago (gh#cherrypy/cheroot#200) -- except for two subtests still - failing on some platforms presumably because of OBS specific + failing on some platforms presumably because of OBS specific network setups * skip the one test requiring python-jaraco.context in Factory staging so that we do not need that package in Ring1. @@ -188,7 +198,7 @@ Tue May 19 10:35:40 UTC 2020 - Tomáš Chvátal ------------------------------------------------------------------- Thu May 7 09:33:29 UTC 2020 - Pablo Suárez Hernández -- Avoid possible race condition on persistent HTTP connections (bsc#1169604) +- Avoid possible race condition on persistent HTTP connections (bsc#1169604) - Added: * 0001-Avoid-race-condition-on-persistent-HTTP-connections.patch @@ -214,8 +224,8 @@ Wed Oct 23 13:38:06 UTC 2019 - Marketa Calabkova * Deprecated use of negative timeouts as alias for infinite timeouts in ThreadPool.stop. * For OPTION requests, bypass URI as path if it does not appear absolute. * Workers are now request-based, addressing the long-standing issue with keep-alive connections - * Remove custom setup.cfg parser handling, allowing the project (including sdist) - to build/run on setuptools 41.4. Now building cheroot requires setuptools 30.3 or later + * Remove custom setup.cfg parser handling, allowing the project (including sdist) + to build/run on setuptools 41.4. Now building cheroot requires setuptools 30.3 or later (for declarative config support) and preferably 34.4 or later (as indicated in pyproject.toml). ------------------------------------------------------------------- diff --git a/python-cheroot.spec b/python-cheroot.spec index c1be0a0..a666aee 100644 --- a/python-cheroot.spec +++ b/python-cheroot.spec @@ -26,7 +26,7 @@ %bcond_with ringdisabled %{?sle15_python_module_pythons} Name: python-%{pypi_name} -Version: 9.0.0 +Version: 10.0.0 Release: 0 Summary: Pure-python HTTP server License: BSD-3-Clause @@ -38,8 +38,6 @@ Source99: cheroot.rpmlintrc Patch0: no-pypytools.patch # PATCH-FIX-UPSTREAM no-relative-imports.patch bsc#[0-9]+ mcepl@suse.com Patch1: no-relative-imports.patch -# https://github.com/cherrypy/cheroot/commit/f3170d40a699219345abb5813395ff39319fec86 -Patch2: python-cheroot-no-six.patch BuildRequires: %{python_module base >= 3.6} BuildRequires: %{python_module importlib-metadata if %python-base < 3.8} BuildRequires: %{python_module jaraco.functools} @@ -71,9 +69,6 @@ BuildRequires: %{python_module urllib3 >= 1.25} # /SECTION Requires: python-jaraco.functools Requires: python-more-itertools >= 2.6 -%if 0%{python_version_nodots} < 38 -Requires: python-importlib-metadata -%endif %if %{with libalternatives} Requires: alts BuildRequires: alts