diff --git a/0001-Do-not-depend-on-fixtures-streams.patch b/0001-Do-not-depend-on-fixtures-streams.patch new file mode 100644 index 0000000..d27cce3 --- /dev/null +++ b/0001-Do-not-depend-on-fixtures-streams.patch @@ -0,0 +1,29 @@ +From 5cb057af95db1f7a00f6b393401b1ca4f6a2cd14 Mon Sep 17 00:00:00 2001 +From: Zane Bitter +Date: Mon, 16 Oct 2023 23:07:52 +1300 +Subject: [PATCH] Do not depend on fixtures[streams] + +The streams extra is not yet packaged in Fedora, so we can't depend on +it. Instead, depend on testtools directly. +--- + tox.ini | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tox.ini b/tox.ini +index 8e54cba..3b2ed0a 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -6,9 +6,8 @@ isolated_build = true + deps = + pytest + fixtures +- fixtures[streams] + pip>=19;python_version<'3.7' +- testtools;python_version<'3.7' ++ testtools + commands = + pytest + +-- +2.41.0 + diff --git a/python-autopage.spec b/python-autopage.spec index 309ec73..7a56550 100644 --- a/python-autopage.spec +++ b/python-autopage.spec @@ -17,14 +17,17 @@ Name: python-%{srcname} Version: 0.5.2 -Release: 12%{?dist} +Release: 1%{?dist} Summary: A Python library to provide automatic paging for console output -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +License: ASL 2.0 URL: https://pypi.python.org/pypi/autopage Source0: %{pypi_source} Source1: setup.py +# autopage should ideally require fixtures[streams], but we don't have that +# packaged in Fedora yet. +Patch1: 0001-Do-not-depend-on-fixtures-streams.patch + BuildArch: noarch %global _description %{expand: @@ -41,7 +44,10 @@ BuildRequires: pyproject-rpm-macros %else %if %{with enable_tests} BuildRequires: %{py3_dist fixtures} -BuildRequires: %{py3_dist fixtures[streams]} +# autopage should ideally require fixtures[streams], but we don't have that +# packaged in Fedora yet. Once that is available, we can depend on only that +# instead of testtools. +BuildRequires: %{py3_dist testtools} %endif %endif @@ -92,81 +98,9 @@ cp %{SOURCE1} ./ %doc README.md %changelog -* Fri Sep 19 2025 Python Maint - 0.5.2-12 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 0.5.2-11 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 0.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 0.5.2-9 -- Rebuilt for Python 3.14 - -* Sat Jan 18 2025 Fedora Release Engineering - 0.5.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 24 2024 Miroslav Suchý - 0.5.2-7 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 0.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 0.5.2-5 -- Rebuilt for Python 3.13 - -* Fri Jan 26 2024 Fedora Release Engineering - 0.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Oct 25 2023 Zane Bitter 0.5.2-2 -- Depend on fixtures[streams] directly - * Mon Oct 16 2023 Zane Bitter 0.5.2-1 - Fix tests with less v633 - Fix test reliability -* Fri Jul 21 2023 Fedora Release Engineering - 0.5.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 03 2023 Python Maint - 0.5.1-6 -- Rebuilt for Python 3.12 - -* Mon Jul 03 2023 Karolina Surma - 0.5.1-5 -- Add the missing test dependency on python-testtools - -* Fri Jan 20 2023 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 15 2022 Python Maint - 0.5.1-2 -- Rebuilt for Python 3.11 - -* Fri May 27 2022 Zane Bitter 0.5.1-1 -- Update to v0.5.1 to fix test reliability - -* Fri Jan 21 2022 Zane Bitter 0.5.0-1 -- Update to v0.5.0 - -* Fri Jan 21 2022 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Oct 27 2021 Zane Bitter 0.4.0-2 -- Update specfile to build for more distros - -* Mon Jul 12 2021 Zane Bitter 0.4.0-1 -- Update to v0.4.0 - -* Fri Jun 25 2021 Zane Bitter 0.3.1-1 -- Update to v0.3.1 for easier packaging - -* Fri Jun 25 2021 Zane Bitter 0.3.0-2 -- Support building for EPEL - -* Fri Jun 18 2021 Zane Bitter 0.3.0-1 -- Initial build +* Wed May 24 2023 Zane Bitter 0.5.1-1 +- Initial build for EPEL 9 diff --git a/setup.py b/setup.py index 37f64cf..b74842f 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ from setuptools import setup -setup(install_requires=["setuptools>=30.3.0"]) +if __name__ == '__main__': + setup(install_requires=["setuptools>=30.3.0"])