From eada7d8c3f668e2f93882e4cb37b8730acd1e41f83e4159eb7be640bd8a7f484 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 1 Aug 2022 16:10:18 +0000 Subject: [PATCH] Accepting request 992059 from home:bnavigator:branches:devel:languages:python:pytest - Update build requirements: Without setuptools_scm[toml], this installs a version 0.0.0 into the python metadata. - Drop obsolete remove_bindir.patch OBS-URL: https://build.opensuse.org/request/show/992059 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-localserver?expand=0&rev=9 --- python-pytest-localserver.changes | 7 +++++++ python-pytest-localserver.spec | 18 ++++++++++++------ remove_bindir.patch | 6 ------ 3 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 remove_bindir.patch diff --git a/python-pytest-localserver.changes b/python-pytest-localserver.changes index 76a43c7..ac318e7 100644 --- a/python-pytest-localserver.changes +++ b/python-pytest-localserver.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 1 15:00:37 UTC 2022 - Ben Greiner + +- Update build requirements: Without setuptools_scm[toml], this + installs a version 0.0.0 into the python metadata. +- Drop obsolete remove_bindir.patch + ------------------------------------------------------------------- Sun Jul 31 12:21:40 UTC 2022 - Torsten Gruner diff --git a/python-pytest-localserver.spec b/python-pytest-localserver.spec index dfa805d..a0cb67d 100644 --- a/python-pytest-localserver.spec +++ b/python-pytest-localserver.spec @@ -17,7 +17,7 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-pytest-localserver Version: 0.6.0 @@ -26,12 +26,18 @@ Summary: Plugin for py.test to test server connections locally License: MIT URL: https://github.com/pytest-dev/pytest-localserver Source: https://files.pythonhosted.org/packages/source/p/pytest-localserver/pytest-localserver-%{version}.tar.gz -Patch0: remove_bindir.patch BuildRequires: %{python_module Werkzeug >= 0.10} BuildRequires: %{python_module aiosmtpd} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 2.0.0} BuildRequires: %{python_module requests} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools >= 42} +BuildRequires: %{python_module setuptools_scm >= 3.4.1} +BuildRequires: %{python_module wheel} +%if 0%{?suse_version} <= 1500 +# old setuptools_scm[toml] needs explicit extra +BuildRequires: %{python_module toml} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Werkzeug >= 0.10 @@ -55,10 +61,10 @@ no further! sed -i "1d" pytest_localserver/{plugin,smtp}.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -68,6 +74,6 @@ sed -i "1d" pytest_localserver/{plugin,smtp}.py %doc README.rst %license LICENSE %{python_sitelib}/pytest_localserver -%{python_sitelib}/pytest_localserver-*-py*.egg-info +%{python_sitelib}/pytest_localserver-%{version}*-info %changelog diff --git a/remove_bindir.patch b/remove_bindir.patch deleted file mode 100644 index 6a6c53d..0000000 --- a/remove_bindir.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- /dev/null -+++ b/tests/__init__.py -@@ -0,0 +1,3 @@ -+import sys -+if '/usr/bin' in sys.path: -+ del sys.path[sys.path.index('/usr/bin')]