public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/python-catkin_tools] rawhide: Update to 0.9.5 + spec cleanup + drop upstreamed patches
Date: Wed, 05 Aug 2026 22:40:13 GMT [thread overview]
Message-ID: <178596961399.1.15232750427296344030.rpms-python-catkin_tools-8079a2f9c5c6@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-catkin_tools
Branch : rawhide
Commit : 8079a2f9c5c69f84a3a33f83692f1cd3d93004fa
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date : 2026-08-05T19:38:46-03:00
Stats : +18/-75 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/python-catkin_tools/c/8079a2f9c5c69f84a3a33f83692f1cd3d93004fa?branch=rawhide
Log:
Update to 0.9.5 + spec cleanup + drop upstreamed patches
Resolves: rhbz#2357330 - python-catkin_tools-0.9.5 is available
Resolves: rhbz#2377509 - python-catkin_tools: Stop using deprecated %py3_build/%py3_install macros
Resolves: rhbz#2485794 - F45FailsToInstall: python3-catkin_tools
Resolves: rhbz#2504452 - python-catkin_tools: FTBFS in Fedora rawhide/f45
---
diff --git a/.gitignore b/.gitignore
index ac0cd9c..38f2240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-/catkin_tools-4464fb0db62602276df27ed241cef3020f8c8fc9.tar.gz
-/catkin_tools-b151cd42cbe25ead1ba2a79165fa4123ade2dac3.tar.gz
-/catkin_tools-1cacc064f374930f3f3fa0ea89e9ddbc5c95c196.tar.gz
-/catkin_tools-e1ac5e51bbabc650fa78edf9009ba22cc366f4e5.tar.gz
-/catkin_tools-0.4.2.tar.gz
-/catkin_tools-0.4.4.tar.gz
-/catkin_tools-0.4.5.tar.gz
-/catkin_tools-0.6.1.tar.gz
-/catkin_tools-0.8.2.tar.gz
-/catkin_tools-0.9.3.tar.gz
-/catkin_tools-0.9.4.tar.gz
+/catkin_tools-*.tar.gz
diff --git a/catkin_tools-0.9.5-sphinx8.patch b/catkin_tools-0.9.5-sphinx8.patch
deleted file mode 100644
index c7e4cb6..0000000
--- a/catkin_tools-0.9.5-sphinx8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8ef11ff40514ea9cdb973e4f8486fcc26f5eadcf Mon Sep 17 00:00:00 2001
-From: Timon Engelke <timon.engelke@online.de>
-Date: Thu, 3 Apr 2025 21:31:06 +0200
-Subject: [PATCH] ci: modernize github workflow
-
----
- .github/workflows/workflow.yml | 46 +++++++++++++++++++++++++++++-----
- docs/conf.py | 2 +-
- tests/test_code_format.py | 16 ------------
- 3 files changed, 41 insertions(+), 23 deletions(-)
- delete mode 100644 tests/test_code_format.py
-
-diff --git a/docs/conf.py b/docs/conf.py
-index 2106a275..a9d4f5d6 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -275,7 +275,7 @@
-
-
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/': None}
-+intersphinx_mapping = {'python': ('http://docs.python.org/', None)}
-
- # programoutput options
- #programoutput_use_ansi = True
diff --git a/python-catkin_tools-rm-python-mock-usage.patch b/python-catkin_tools-rm-python-mock-usage.patch
deleted file mode 100644
index fc4a173..0000000
--- a/python-catkin_tools-rm-python-mock-usage.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tests/unit/test_common.py
-+++ b/tests/unit/test_common.py
-@@ -1,4 +1,4 @@
--import mock
-+from unittest import mock
-
- from catkin_tools import common
-
---- a/tests/unit/test_config.py
-+++ b/tests/unit/test_config.py
-@@ -1,7 +1,7 @@
- import os
- import shutil
-
--import mock
-+from unittest import mock
- import pytest
-
- from catkin_tools import config
diff --git a/python-catkin_tools.spec b/python-catkin_tools.spec
index f844ca9..a11a7a2 100644
--- a/python-catkin_tools.spec
+++ b/python-catkin_tools.spec
@@ -1,18 +1,15 @@
%global srcname catkin_tools
+%global forgeurl https://github.com/catkin/catkin_tools
+Version: 0.9.5
+%forgemeta
Name: python-%{srcname}
-Version: 0.9.4
Release: %autorelease
Summary: Command line tools for working with catkin
License: Apache-2.0
-URL: http://catkin-tools.readthedocs.org
-Source0: https://github.com/catkin/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
-# From https://github.com/catkin/catkin_tools/commit/8ef11ff40514ea9cdb973e4f8486fcc26f5eadcf
-Patch0: %{srcname}-0.9.5-sphinx8.patch
-# Maintainers, please upstream
-Patch1: %{name}-rm-python-mock-usage.patch
-
+URL: %{forgeurl}
+Source: %{forgesource}
BuildArch: noarch
%description
@@ -38,13 +35,9 @@ BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-osrf-pycommon >= 0.1.1
BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-PyYAML
-BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: python%{python3_pkgversion}-pkg-resources
Requires: cmake
Requires: make
-Requires: python%{python3_pkgversion}-pkg-resources
Conflicts: python2-%{srcname} < 0.4.4-7
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
%if %{undefined __pythondist_requires}
Requires: python%{python3_pkgversion}-catkin_pkg >= 0.3.0
@@ -62,22 +55,29 @@ Provides command line tools for working with catkin
%prep
-%autosetup -p1 -n %{srcname}-%{version}
+%forgeautosetup -p1
+
+
+%generate_buildrequires
+%pyproject_buildrequires
%build
-%py3_build
+%pyproject_wheel
%make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version}
rm docs/_build/html/.buildinfo
%install
-%py3_install
+%pyproject_install
+%pyproject_save_files -l %{srcname}
install -p -m0644 -D docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname}.1
%check
+%pyproject_check_import
+
# Many system tests require catkin itself, which isn't packaged in Fedora
%pytest tests/unit
@@ -86,11 +86,8 @@ install -p -m0644 -D docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{
%license LICENSE
%doc docs/_build/html
-%files -n python%{python3_pkgversion}-%{srcname}
-%license LICENSE
+%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
%doc README.md
-%{python3_sitelib}/%{srcname}/
-%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
%{_bindir}/catkin
%{_mandir}/man1/%{srcname}.1.*
%{_datadir}/zsh/site-functions/_catkin
diff --git a/sources b/sources
index c094244..ee3c7ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (catkin_tools-0.9.4.tar.gz) = df7184e8e2fd6c10acc5514820d39b22a0069d04b6383646e3fb86977585fc5acb478f89ec70cfc1b8e6226adf06744cbf208c526e17911b10fc82b04547cc5b
+SHA512 (catkin_tools-0.9.5.tar.gz) = 76f771883e5437c40cb0375d10799940ff467ba3f2b9b9181f9130dfc96fdfad337ea74d1433973e2a4bf52661551df8c24be6af7003dc6d92ae9fdf9aadc4e0
reply other threads:[~2026-08-05 22:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178596961399.1.15232750427296344030.rpms-python-catkin_tools-8079a2f9c5c6@fedoraproject.org \
--to=rosset.filipe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox