Accepting request 1282805 from devel:languages:python

- fix usage of libalternatives

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

0.4.24.tar.gz

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

1.0.0.tar.gz

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

python-catkin-pkg-no-mock.patch

@@ -1,74 +0,0 @@
-diff --git a/test/test_package.py b/test/test_package.py
-index 98420c5..1a417b0 100644
---- a/test/test_package.py
-+++ b/test/test_package.py
-@@ -20,7 +20,10 @@
-     Person,
- )
- 
--from mock import Mock
-+try:
-+    from unittest.mock import Mock
-+except ImportError:
-+    from mock import Mock
- 
- sys.stderr = sys.stdout
- 
-diff --git a/test/test_package_version.py b/test/test_package_version.py
-index 6265347..190802b 100644
---- a/test/test_package_version.py
-+++ b/test/test_package_version.py
-@@ -9,7 +9,10 @@
- from catkin_pkg.package_version import update_changelog_sections
- from catkin_pkg.package_version import update_versions
- 
--import mock
-+try:
-+    from unittest.mock import Mock
-+except ImportError:
-+    from mock import Mock
- 
- from .util import in_temporary_directory
- 
-@@ -69,7 +72,7 @@ def test_update_changelog_unicode(self, directory=None):
-         temp_file = os.path.join(directory, 'changelog')
-         missing_changelogs_but_forthcoming = {}
-         # Mock the Changelog object from catkin_pkg
--        mock_changelog = mock.Mock()
-+        mock_changelog = Mock()
-         # Create a changelog entry with a unicode char.
-         mock_changelog.rst = ('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
-                               'Changelog for package fake_pkg\n'
-diff --git a/test/test_templates.py b/test/test_templates.py
-index 561ec28..164f1b1 100644
---- a/test/test_templates.py
-+++ b/test/test_templates.py
-@@ -8,7 +8,10 @@
-     create_cmakelists, create_package_files, create_package_xml, PackageTemplate
- from catkin_pkg.python_setup import generate_distutils_setup
- 
--from mock import MagicMock, Mock
-+try:
-+    from unittest.mock import MagicMock, Mock
-+except ImportError:
-+    from mock import MagicMock, Mock
- 
- 
- def u(line):
-diff --git a/test/test_topological_order.py b/test/test_topological_order.py
-index 651cb6b..88f44b4 100644
---- a/test/test_topological_order.py
-+++ b/test/test_topological_order.py
-@@ -3,7 +3,10 @@
- import sys
- import unittest
- 
--from mock import Mock
-+try:
-+    from mock import Mock
-+except ImportError:
-+    from unittest.mock import Mock
- 
- try:
-     from catkin_pkg.topological_order import topological_order_packages, _PackageDecorator, \
-

python-catkin-pkg.changes

@@ -1,3 +1,106 @@
+-------------------------------------------------------------------
+Wed Jun  4 14:46:54 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+
+- fix usage of libalternatives
+
+-------------------------------------------------------------------
+Thu May 15 21:30:25 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Add missing rpmlintrc to the SPEC file.
+
+-------------------------------------------------------------------
+Thu May 15 13:00:20 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to pip-based build
+
+-------------------------------------------------------------------
+Thu Dec 14 11:16:31 UTC 2023 - pgajdos@suse.com
+
+- deleted patches
+  - python-catkin-pkg-no-mock.patch (upstreamed)
+
+-------------------------------------------------------------------
+Thu Dec 14 09:18:11 UTC 2023 - Petr Gajdos <pgajdos@suse.com>
+
+- update to 1.0.0:
+  * List 'ROS Infrastructure Team' as the package maintainer.
+    `#328 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/328>`_
+  * Drop support for Python 2. `#354 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/354>`_
+  * Move flake8 config to setup.cfg, address flake8 v6
+    violations. `#356 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/356>`_
+  * Contributors
+  * Scott K Logan
+  * Steven! Ragnarök
+  * 0.5.2 (2022-05-27)
+  * Use renamed function for getting multiple build types. `#342
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/342>`_
+  * Resolves `#341 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/341>`_
+  * Contributors
+  * Steven! Ragnarök
+  * 0.5.1 (2022-05-10)
+  * Add API method for getting all build types regardless of
+    conditions. `#337 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/337>`_
+  * Pass all string format arguments as a tuple. `#339
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/339>`_
+  * Resolves `#338 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/338>`_
+  * Consider all build types when updating package versions.
+    `#340 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/340>`_
+  * Resolves `#336 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/336>`_
+  * Contributors
+  * Scott K Logan
+  * Steven! Ragnarök
+  * 0.5.0 (2022-05-10)
+  * Remove references to Travis CI. `#314
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/314>`_
+  * Drop python 2.7 on macOS. `#318 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/318>`_
+  * Update release suites. `#317 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/317>`_
+  * Use unittest.mock where possible. `#321
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/321>`_
+  * Declare test dependencies in extras_require.test. `#323
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/323>`_
+  * Drop support for Python < 2.7 (2.7 itself is still
+    supported). `#322 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/322>`_
+  * Run tests with pytest instead of nose. `#324
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/324>`_
+  * Enable Python 3.10 tests, bump actions/setup-python. `#325
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/325>`_
+  * Mark linter test and declare cov/junit module name. `#327
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/327>`_
+  * Add plaintext_description field to Package. `#305
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/305>`_
+  * Use only first line of plaintext description in distutils
+    setup generation. `#326 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/326>`_
+  * Update catkin_prepare_release to support setup.py files in
+    ament_python packages. `#331 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/331>`_
+  * This pull requests introduces an API change!
+  * ``catkin_pkg.package_version.update_packages`` now takes the
+    full dict of package Paths: Package objects instead of just
+    the paths.
+  * Make filenames to be used as ignore markers configurable.
+    `#307 <https://github.com/ros-
+    infrastructure/catkin_pkg/pull/307>`_
+  * Fix catkin_package_version after API change. `#333
+    <https://github.com/ros-infrastructure/catkin_pkg/pull/333>`_
+  * Contributors
+  * Jan Strohbeck
+  * Scott K Logan
+  * Steven! Ragnarök
+  * Tomáš Hrnčiar
+  * William Woodall
+
 -------------------------------------------------------------------
 Wed Mar  9 11:43:28 UTC 2022 - pgajdos@suse.com
 

python-catkin-pkg.rpmlintrc

@@ -0,0 +1,2 @@
+addFilter("alternative-generic-name-missing")
+addFilter("alternative-link-missing")

python-catkin-pkg.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-catkin-pkg
 #
-# Copyright (c) 2022 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,27 +16,27 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without libalternatives
 %define commands create_pkg find_pkg generate_changelog package_version prepare_release tag_changelog test_changelog
-%define skip_python2 1
 Name:           python-catkin-pkg
-Version:        0.4.24
+Version:        1.0.0
 Release:        0
 Summary:        Catkin package library
 License:        BSD-3-Clause
 URL:            https://wiki.ros.org/catkin_pkg
-Source:         https://github.com/ros-infrastructure/catkin_pkg/archive/%{version}.tar.gz
+Source0:        https://github.com/ros-infrastructure/catkin_pkg/archive/%{version}.tar.gz
-# https://github.com/ros-infrastructure/catkin_pkg/commit/b5c6812b40fa31da91ee560dda7c6e470dedcfb8.diff
+Source99:       python-catkin-pkg.rpmlintrc
-Patch0:         python-catkin-pkg-no-mock.patch
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  alts
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       alts
 Requires:       python-docutils
 Requires:       python-pyparsing
 Requires:       python-python-dateutil
 Requires:       python-setuptools
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module docutils}
@@ -51,14 +51,13 @@ BuildRequires:  %{python_module python-dateutil}
 Library for retrieving information about catkin packages.
 
 %prep
-%setup -q -n catkin_pkg-%{version}
+%autosetup -p1 -n catkin_pkg-%{version}
-%autopatch -p1
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 for c in %{commands}; do
   %python_clone -a %{buildroot}%{_bindir}/catkin_$c
 done
@@ -69,15 +68,13 @@ export PYTHONPATH=$PWD/src
 # flake8 line length checks failing (E501)
 %pytest -k 'not test_flake8'
 
-%post
+%pre
+# If libalternatives is used: Removing old update-alternatives entries.
 for c in %{commands}; do
-  %python_install_alternative catkin_$c
+  %python_libalternatives_reset_alternative catkin_$c
 done
 
-%postun
+# post and postun macro call is not needed with only libalternatives
-for c in %{commands}; do
-  %python_uninstall_alternative catkin_$c
-done
 
 %files %{python_files}
 %license LICENSE
@@ -88,6 +85,7 @@ done
 %python_alternative %{_bindir}/catkin_prepare_release
 %python_alternative %{_bindir}/catkin_tag_changelog
 %python_alternative %{_bindir}/catkin_test_changelog
-%{python_sitelib}/*
+%{python_sitelib}/catkin_pkg
+%{python_sitelib}/catkin_pkg*-info
 
 %changelog