python/python-cheroot
SHA256
15
0
Fork 0
forked from pool/python-cheroot
Code Pull Requests Activity

Accepting request 1073643 from devel:languages:python

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1073643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cheroot?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger
2023-03-24 14:16:13 +00:00
committed by Git OBS Bridge
parent 03440befd5 12affebae8
commit 3db72ae68b
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python-cheroot-no-six.patch Normal file
View File

@@ -0,0 +1,22 @@
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.

8
python-cheroot.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 21 10:34:26 UTC 2023 - pgajdos@suse.com
- do not require python-six
- added patches
fix https://github.com/cherrypy/cheroot/commit/f3170d40a699219345abb5813395ff39319fec86
+ python-cheroot-no-six.patch
-------------------------------------------------------------------
Mon Jan 2 18:19:04 UTC 2023 - Ben Greiner <code@bnavigator.de>

5
python-cheroot.spec
View File

@@ -23,7 +23,6 @@
%endif
%define pypi_name cheroot
%define skip_python2 1
%bcond_with ringdisabled
Name: python-%{pypi_name}
Version: 9.0.0
@@ -38,6 +37,8 @@ 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}
@@ -46,7 +47,6 @@ BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools >= 34.4}
BuildRequires: %{python_module setuptools_scm >= 1.15.0}
BuildRequires: %{python_module setuptools_scm_git_archive >= 1.0}
BuildRequires: %{python_module six >= 1.11.0}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros >= 20210929
@@ -71,7 +71,6 @@ BuildRequires: %{python_module urllib3 >= 1.25}
# /SECTION
Requires: python-jaraco.functools
Requires: python-more-itertools >= 2.6
Requires: python-six >= 1.11.0
%if 0%{python_version_nodots} < 38
Requires: python-importlib-metadata
%endif