diff --git a/0.4.24.tar.gz b/0.4.24.tar.gz deleted file mode 100644 index 4443db1..0000000 --- a/0.4.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57ea09fd51d9a67ccf5a0660a8f84794304182c4f644f27ad835a979567893b1 -size 65113 diff --git a/1.0.0.tar.gz b/1.0.0.tar.gz new file mode 100644 index 0000000..ddbbab8 --- /dev/null +++ b/1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48e88c995838807165bb70c6272abab2d6dda5efc210f62db8ac714d4c96a0c6 +size 67603 diff --git a/python-catkin-pkg-no-mock.patch b/python-catkin-pkg-no-mock.patch deleted file mode 100644 index 2d1d1e9..0000000 --- a/python-catkin-pkg-no-mock.patch +++ /dev/null @@ -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, \ - diff --git a/python-catkin-pkg.changes b/python-catkin-pkg.changes index 378fbff..5ec2565 100644 --- a/python-catkin-pkg.changes +++ b/python-catkin-pkg.changes @@ -1,3 +1,91 @@ +------------------------------------------------------------------- +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 + +- update to 1.0.0: + * List 'ROS Infrastructure Team' as the package maintainer. + `#328 `_ + * Drop support for Python 2. `#354 `_ + * Move flake8 config to setup.cfg, address flake8 v6 + violations. `#356 `_ + * Contributors + * Scott K Logan + * Steven! Ragnarök + * 0.5.2 (2022-05-27) + * Use renamed function for getting multiple build types. `#342 + `_ + * Resolves `#341 `_ + * Contributors + * Steven! Ragnarök + * 0.5.1 (2022-05-10) + * Add API method for getting all build types regardless of + conditions. `#337 `_ + * Pass all string format arguments as a tuple. `#339 + `_ + * Resolves `#338 `_ + * Consider all build types when updating package versions. + `#340 `_ + * Resolves `#336 `_ + * Contributors + * Scott K Logan + * Steven! Ragnarök + * 0.5.0 (2022-05-10) + * Remove references to Travis CI. `#314 + `_ + * Drop python 2.7 on macOS. `#318 `_ + * Update release suites. `#317 `_ + * Use unittest.mock where possible. `#321 + `_ + * Declare test dependencies in extras_require.test. `#323 + `_ + * Drop support for Python < 2.7 (2.7 itself is still + supported). `#322 `_ + * Run tests with pytest instead of nose. `#324 + `_ + * Enable Python 3.10 tests, bump actions/setup-python. `#325 + `_ + * Mark linter test and declare cov/junit module name. `#327 + `_ + * Add plaintext_description field to Package. `#305 + `_ + * Use only first line of plaintext description in distutils + setup generation. `#326 `_ + * Update catkin_prepare_release to support setup.py files in + ament_python packages. `#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 `_ + * Fix catkin_package_version after API change. `#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 diff --git a/python-catkin-pkg.rpmlintrc b/python-catkin-pkg.rpmlintrc new file mode 100644 index 0000000..e93cfd1 --- /dev/null +++ b/python-catkin-pkg.rpmlintrc @@ -0,0 +1,2 @@ +addFilter("alternative-generic-name-missing") +addFilter("alternative-link-missing") diff --git a/python-catkin-pkg.spec b/python-catkin-pkg.spec index b17640a..8c82fc2 100644 --- a/python-catkin-pkg.spec +++ b/python-catkin-pkg.spec @@ -1,7 +1,7 @@ # # spec file for package python-catkin-pkg # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,15 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %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 -# https://github.com/ros-infrastructure/catkin_pkg/commit/b5c6812b40fa31da91ee560dda7c6e470dedcfb8.diff -Patch0: python-catkin-pkg-no-mock.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -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