From f6c27c0cc70adcc674c8a2a8e8752c5cb7aeb1f7 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: May 11 2022 00:36:01 +0000
Subject: Update to 0.5.0


---

diff --git a/.gitignore b/.gitignore
index cb5cd21..50ebbc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /catkin_pkg-0.4.20.tar.gz
 /catkin_pkg-0.4.22.tar.gz
 /catkin_pkg-0.4.23.tar.gz
+/catkin_pkg-0.5.0.tar.gz
diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec
index a4eaf3b..27e9e9b 100644
--- a/python-catkin_pkg.spec
+++ b/python-catkin_pkg.spec
@@ -1,11 +1,10 @@
-%{?!_without_doc:%global with_doc 0%{?_with_doc:1} || !0%{?rhel} || 0%{?rhel} >= 7}
 %{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?fedora} >= 32 || 0%{?rhel} >= 8)}
 %{?!_without_python3:%global with_python3 0%{?_with_python3:1} || !0%{?rhel} || 0%{?rhel} >= 7}
 
 %global srcname catkin_pkg
 
 Name:           python-%{srcname}
-Version:        0.4.23
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Library for retrieving information about catkin packages
 
@@ -19,14 +18,13 @@ BuildArch:      noarch
 %{summary}
 
 
-%if 0%{?with_doc}
 %package doc
 Summary:        HTML documentation for %{name}
+BuildRequires:  make
 BuildRequires:  python%{python3_pkgversion}-sphinx
 
 %description doc
 HTML API documentation for the Python module '%{srcname}'
-%endif
 
 
 %if 0%{?with_python2}
@@ -36,8 +34,8 @@ BuildRequires:  python2-dateutil
 BuildRequires:  python2-devel
 BuildRequires:  python2-docutils
 BuildRequires:  python2-mock
-BuildRequires:  python2-nose
 BuildRequires:  python2-pyparsing
+BuildRequires:  python2-pytest
 BuildRequires:  python2-setuptools
 %{?python_provide:%python_provide python2-%{srcname}}
 
@@ -45,9 +43,10 @@ BuildRequires:  python2-setuptools
 Requires:       python2-dateutil
 Requires:       python2-docutils
 Requires:       python2-pyparsing
+Requires:       python2-setuptools
 %endif
 
-%if (!0%{?rhel} || 0%{?rhel} >= 8) && (0%{?with_doc})
+%if !0%{?rhel} || 0%{?rhel} >= 8
 Suggests:       %{name}-doc = %{version}-%{release}
 %endif
 
@@ -62,9 +61,8 @@ Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-dateutil
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-docutils
-BuildRequires:  python%{python3_pkgversion}-mock
-BuildRequires:  python%{python3_pkgversion}-nose
 BuildRequires:  python%{python3_pkgversion}-pyparsing
+BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-setuptools
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
@@ -72,9 +70,10 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 Requires:       python%{python3_pkgversion}-dateutil
 Requires:       python%{python3_pkgversion}-docutils
 Requires:       python%{python3_pkgversion}-pyparsing
+Requires:       python%{python3_pkgversion}-setuptools
 %endif
 
-%if (!0%{?rhel} || 0%{?rhel} >= 8) && (0%{?with_doc})
+%if !0%{?rhel} || 0%{?rhel} >= 8
 Suggests:       %{name}-doc = %{version}-%{release}
 %endif
 
@@ -86,6 +85,9 @@ Suggests:       %{name}-doc = %{version}-%{release}
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
 
+# Drop unsupported syntax in older setuptools
+sed -i "s/mock; python_version < '3.3'//" setup.py
+
 
 %build
 %if 0%{?with_python2}
@@ -96,12 +98,10 @@ Suggests:       %{name}-doc = %{version}-%{release}
 %py3_build
 %endif
 
-%if 0%{?with_doc}
 PYTHONPATH=$PWD/build/lib \
   PYTHONDONTWRITEBYTECODE=1 \
   %make_build -C doc html SPHINXBUILD=sphinx-build-%{python3_version} SPHINXAPIDOC=sphinx-apidoc-%{python3_version}
 rm doc/_build/html/.buildinfo
-%endif
 
 
 %install
@@ -120,30 +120,26 @@ rmdir %{buildroot}%{_bindir}/python%{python3_pkgversion}
 
 %check
 %if 0%{?with_python2}
-%if "%{python2_version}" == "2.6"
-# Skip tests that use python 2.7 assertions
-PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w test \
-  -e "(test_check_known_attributes|test_create_package_template|test_flake8|test_package_decorator_init|test_topological_order_packages_with_duplicates|test_validate_metapackage|test_validate_package)"
-%else
-PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m nose -w test -e "(test_flake8)"
-%endif
+%{__python2} -m pytest \
+  --ignore=test/test_flake8.py \
+  test
 %endif
 
 %if 0%{?with_python3}
-PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test_flake8)"
+%{__python3} -m pytest \
+  --ignore=test/test_flake8.py \
+  test
 %endif
 
 
-%if 0%{?with_doc}
 %files doc
 %license LICENSE
 %doc doc/_build/html
-%endif
 
 %if 0%{?with_python2}
 %files -n python2-%{srcname}
 %license LICENSE
-%doc README.rst
+%doc CHANGELOG.rst README.rst
 %{python2_sitelib}/%{srcname}/
 %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info/
 %{_bindir}/catkin_create_pkg
@@ -158,7 +154,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE
-%doc README.rst
+%doc CHANGELOG.rst README.rst
 %{python3_sitelib}/%{srcname}/
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
 %{_bindir}/python%{python3_pkgversion}-catkin_create_pkg
@@ -172,6 +168,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test
 
 
 %changelog
+* Tue May 10 2022 Scott K Logan <logans@cottsay.net> - 0.5.0-1
+- Update to 0.5.0 (rhbz#2083893)
+
 * Wed Sep 30 2020 Scott K Logan <logans@cottsay.net> - 0.4.23-1
 - Update to 0.4.23 (rhbz#1883763)
 
diff --git a/sources b/sources
index fd12bb5..8fa7b0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (catkin_pkg-0.4.23.tar.gz) = f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
+SHA512 (catkin_pkg-0.5.0.tar.gz) = 505c9ff6199f07522b15437aafe11356bb96fbf2ea7dcae09540fae30ec4e5a34fa577c0e83dee89af478e2bf0a9ab334e0aedb35ee1a082376d6d60ad33f160