From ae1a1144bf8c99973d31ed4762d7410c3ba0df67408d0f73a31e96117cf841ea Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Fri, 9 Dec 2022 10:52:10 +0000 Subject: [PATCH] Accepting request 1041389 from home:pgajdos:python - do not require six - added patches fix https://github.com/man-group/pytest-plugins/issues/209 + python-pytest-pyramid-server-no-six.patch OBS-URL: https://build.opensuse.org/request/show/1041389 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-pyramid-server?expand=0&rev=3 --- python-pytest-pyramid-server-no-six.patch | 13 +++++++++++++ python-pytest-pyramid-server.changes | 8 ++++++++ python-pytest-pyramid-server.spec | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 python-pytest-pyramid-server-no-six.patch diff --git a/python-pytest-pyramid-server-no-six.patch b/python-pytest-pyramid-server-no-six.patch new file mode 100644 index 0000000..a6a7adf --- /dev/null +++ b/python-pytest-pyramid-server-no-six.patch @@ -0,0 +1,13 @@ +Index: pytest-pyramid-server-1.7.0/pytest_pyramid_server.py +=================================================================== +--- pytest-pyramid-server-1.7.0.orig/pytest_pyramid_server.py ++++ pytest-pyramid-server-1.7.0/pytest_pyramid_server.py +@@ -4,7 +4,7 @@ Created on 25 Apr 2012 + @author: eeaston + ''' + import os +-from six.moves import configparser ++import configparser + import sys + import socket + import glob diff --git a/python-pytest-pyramid-server.changes b/python-pytest-pyramid-server.changes index ac6d898..5de3dd0 100644 --- a/python-pytest-pyramid-server.changes +++ b/python-pytest-pyramid-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 8 12:05:36 UTC 2022 - pgajdos@suse.com + +- do not require six +- added patches + fix https://github.com/man-group/pytest-plugins/issues/209 + + python-pytest-pyramid-server-no-six.patch + ------------------------------------------------------------------- Wed Sep 18 12:06:12 UTC 2019 - John Vandenberg diff --git a/python-pytest-pyramid-server.spec b/python-pytest-pyramid-server.spec index ba61a0d..43dabdc 100644 --- a/python-pytest-pyramid-server.spec +++ b/python-pytest-pyramid-server.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytest-pyramid-server # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/manahl/pytest-plugins Source: https://files.pythonhosted.org/packages/source/p/pytest-pyramid-server/pytest-pyramid-server-%{version}.tar.gz +# https://github.com/man-group/pytest-plugins/issues/209 +Patch0: python-pytest-pyramid-server-no-six.patch BuildRequires: %{python_module setuptools-git} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -47,7 +49,7 @@ BuildRequires: %{python_module waitress} Pyramid server fixture for py.test. %prep -%setup -q -n pytest-pyramid-server-%{version} +%autosetup -p1 -n pytest-pyramid-server-%{version} %build %python_build