diff --git a/python-vine.changes b/python-vine.changes index 062ca37..d6730ce 100644 --- a/python-vine.changes +++ b/python-vine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 13 05:14:47 UTC 2024 - Steve Kowalik + +- Switch to pyproject and autosetup macros. +- No more greedy globs in %files. +- Add patch use-correct-test-method.patch: + * Use setup_method() to work with Pytest 8. + ------------------------------------------------------------------- Mon Nov 27 20:09:58 UTC 2023 - Dirk Müller diff --git a/python-vine.spec b/python-vine.spec index 7fc0b4d..019277b 100644 --- a/python-vine.spec +++ b/python-vine.spec @@ -1,7 +1,7 @@ # # spec file for package python-vine # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,11 @@ Summary: Python Promises License: BSD-3-Clause URL: https://github.com/celery/vine/ Source: https://files.pythonhosted.org/packages/source/v/vine/vine-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#celery/vine#105 +Patch0: use-correct-test-method.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch @@ -38,13 +42,13 @@ BuildRequires: %{python_module pytest} Promises implementation for python. %prep -%setup -q -n vine-%{version} +%autosetup -p1 -n vine-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -53,6 +57,7 @@ Promises implementation for python. %files %{python_files} %doc Changelog README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/vine +%{python_sitelib}/vine-%{version}.dist-info %changelog diff --git a/use-correct-test-method.patch b/use-correct-test-method.patch new file mode 100644 index 0000000..5b92418 --- /dev/null +++ b/use-correct-test-method.patch @@ -0,0 +1,28 @@ +From 8b41bf0052de96672c69a8c297cb24f1dd9c0d69 Mon Sep 17 00:00:00 2001 +From: Stanislav Levin +Date: Tue, 27 Feb 2024 20:09:28 +0300 +Subject: [PATCH] tests: Replace deprecated setup method + +Nose's `setup` method is deprecated since Pytest 7.2. + +See https://docs.pytest.org/en/stable/deprecations.html#support-for-tests-written-for-nose for details. + +Fixes: https://github.com/celery/vine/issues/104 +Signed-off-by: Stanislav Levin +--- + t/unit/test_synchronization.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/unit/test_synchronization.py b/t/unit/test_synchronization.py +index 87335b6..47b7a10 100644 +--- a/t/unit/test_synchronization.py ++++ b/t/unit/test_synchronization.py +@@ -8,7 +8,7 @@ + + class test_barrier: + +- def setup(self): ++ def setup_method(self): + self.m1, self.m2, self.m3 = Mock(), Mock(), Mock() + self.ps = [promise(self.m1), promise(self.m2), promise(self.m3)] +