Accepting request 1286576 from devel:languages:python

- Use multibuild for running tests
- Convert to libalternatives

OBS-URL: https://build.opensuse.org/request/show/1286576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-bindep?expand=0&rev=9

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>

bindep-2.11.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acb2f259bce1fd1508873479609bbde5b9aae508378476a68d6b6a19002e7e2f
-size 42317

bindep-2.13.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df7564753e583033bb113338150d772540145b4d189a4801ec56a25b5ede5050
+size 43002

python-bindep.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Wed Jun 18 07:47:52 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Use multibuild for running tests
+
+-------------------------------------------------------------------
+Tue Jun 17 07:58:12 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives
+
+-------------------------------------------------------------------
+Mon Apr 28 08:44:31 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 2.13.0
+  * Python 3.6 is no longer supported.
+- Add missing update-alternatives dependency to Requires
+
+-------------------------------------------------------------------
+Mon Jan 27 12:52:44 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 2.12.0
+  * Basic support for PopOS is now included.
+  * Python 2.7 and 3.5 are no longer supported.
+  * Bindep now depends on the distro python library to determine
+    details about the current platform. This library looks at both
+    /etc/os-release and lsb_release to find platform info. The
+    os-release file data is preferred and at times has slightly
+    different data than lsb_release. Every effort has been made
+    to make this transition backward compatible but some things
+    may have been missed. The motivation for this change is that
+    not all distros have lsb_release available and we can let the
+    distro library sort that out for us.
+- Drop remove-mock.patch, merged upstream
+
 -------------------------------------------------------------------
 Fri May  5 11:04:40 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
 

python-bindep.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-bindep
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,35 +16,33 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+
+%bcond_without libalternatives
 %{?sle15_python_module_pythons}
-Name:           python-bindep
+Name:           python-bindep%{psuffix}
-Version:        2.11.0
+Version:        2.13.0
 Release:        0
 Summary:        Binary dependency utility
 License:        Apache-2.0
 URL:            https://docs.opendev.org/opendev/bindep
 Source:         https://files.pythonhosted.org/packages/source/b/bindep/bindep-%{version}.tar.gz
-Patch0:         remove-mock.patch
 BuildRequires:  %{python_module pbr}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  python-rpm-macros
-# SECTION test requirements
-BuildRequires:  %{python_module distro >= 1.7.0}
-BuildRequires:  %{python_module Parsley}
-BuildRequires:  %{python_module coverage >= 3.6}
-BuildRequires:  %{python_module fixtures >= 0.3.12}
-BuildRequires:  %{python_module hatchling}
-BuildRequires:  %{python_module packaging}
-BuildRequires:  %{python_module pbr >= 2.0.0}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module python-subunit}
-BuildRequires:  %{python_module testrepository >= 0.0.13}
-BuildRequires:  %{python_module testtools >= 0.9.27}
 BuildRequires:  %{python_module wheel}
-# /SECTION
+BuildRequires:  alts
 BuildRequires:  fdupes
 BuildRequires:  openSUSE-release
+BuildRequires:  python-rpm-macros
+Requires:       alts
 Requires:       python-Parsley
 Requires:       python-distro >= 1.7.0
 Requires:       python-packaging
@@ -52,6 +50,24 @@ Requires:       python-pbr >= 2.0.0
 Suggests:       python-distro < 1.7.0
 Suggests:       python-packaging < 21.0
 BuildArch:      noarch
+
+%if %{with test}
+BuildRequires:  %{python_module bindep = %{version}}
+# SECTION test requirements
+BuildRequires:  %{python_module Parsley}
+BuildRequires:  %{python_module coverage >= 3.6}
+BuildRequires:  %{python_module distro >= 1.7.0}
+BuildRequires:  %{python_module fixtures >= 0.3.12}
+BuildRequires:  %{python_module hatchling}
+BuildRequires:  %{python_module packaging}
+BuildRequires:  %{python_module pbr >= 2.0.0}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module python-subunit}
+BuildRequires:  %{python_module testrepository >= 0.0.13}
+BuildRequires:  %{python_module testtools >= 0.9.27}
+# /SECTION
+%endif
+
 %python_subpackages
 
 %description
@@ -69,18 +85,20 @@ installed before `pip` can be used - such as `virtualenv` and `pip` itself.
 %pyproject_wheel
 
 %install
+%if !%{with test}
 %pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/bindep
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
+%if %{with test}
 %pytest -s -k 'not (test_arch_implies_pacman or test_manjaro_implies_pacman)'
+%endif
 
-%post
+%if !%{with test}
-%python_install_alternative bindep
+%pre
-
+%python_libalternatives_reset_alternative bindep
-%postun
-%python_uninstall_alternative bindep
 
 %files %{python_files}
 %doc AUTHORS ChangeLog NEWS.rst README.rst
@@ -88,5 +106,6 @@ installed before `pip` can be used - such as `virtualenv` and `pip` itself.
 %python_alternative %{_bindir}/bindep
 %{python_sitelib}/bindep
 %{python_sitelib}/bindep-%{version}*info
+%endif
 
 %changelog

remove-mock.patch

@@ -1,32 +0,0 @@
-Index: bindep-2.11.0/bindep/tests/test_main.py
-===================================================================
---- bindep-2.11.0.orig/bindep/tests/test_main.py
-+++ bindep-2.11.0/bindep/tests/test_main.py
-@@ -24,7 +24,10 @@ from fixtures import FakeLogger
- from fixtures import Fixture
- from fixtures import MonkeyPatch
- from fixtures import TempDir
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- from testtools import TestCase
- 
- from bindep.__main__ import main
-Index: bindep-2.11.0/bindep/tests/test_depends.py
-===================================================================
---- bindep-2.11.0.orig/bindep/tests/test_depends.py
-+++ bindep-2.11.0/bindep/tests/test_depends.py
-@@ -23,7 +23,10 @@ from textwrap import dedent
- 
- import distro
- import fixtures
--import mock
-+try:
-+    from unittest import mock
-+except ImportError:
-+    import mock
- import ometa.runtime
- from testtools import ExpectedException
- from testtools.matchers import Contains