diff --git a/.gitignore b/.gitignore index f271a02..3a9dbf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /autopage-0.4.0.tar.gz /autopage-0.5.0.tar.gz /autopage-0.5.1.tar.gz +/autopage-0.5.2.tar.gz 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 7687b73..a13f695 100644 --- a/python-autopage.spec +++ b/python-autopage.spec @@ -16,14 +16,18 @@ Name: python-%{srcname} -Version: 0.5.1 -Release: 7%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: A Python library to provide automatic paging for console output 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: @@ -37,14 +41,12 @@ Summary: %{summary} BuildRequires: python3-devel %if %{with pyproject} BuildRequires: pyproject-rpm-macros -# autopage should ideally require fixtures[streams], but we don't have that -# packaged in Fedora yet. Once it's available, we should backport the -# upstream change in tox.ini: https://github.com/zaneb/autopage/commit/08aec4a975d8 -# and remove the BuildRequire below -BuildRequires: %{py3_dist testtools} %else %if %{with enable_tests} BuildRequires: %{py3_dist fixtures} +# 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 @@ -54,11 +56,6 @@ BuildRequires: %{py3_dist testtools} %prep %autosetup -n %{srcname}-%{version} -# end to end tests currently don't work in RPM, one reported example: -# https://github.com/zaneb/autopage/issues/5 -# skip them to enable Python 3.12 rebuild -rm autopage/tests/test_end_to_end.py - %if %{with pyproject} %generate_buildrequires %pyproject_buildrequires -t @@ -101,6 +98,10 @@ cp %{SOURCE1} ./ %doc README.md %changelog +* 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 diff --git a/sources b/sources index 8ed3583..aecfd87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (autopage-0.5.1.tar.gz) = d2db8091bfdb209319ed8f06cea86abdc33e8ea338290d3a6f99341d78d8a9f079021c21c18c9ee7032f13496ed0d3bfe5a96465473fc747da984452d26c0382 +SHA512 (autopage-0.5.2.tar.gz) = a5449fc2a1011a3936c69784803e9f65a603cfa6df2335b095b029051fc26742109141ef2eb201f567334c0617433f29477efc43d98357d7ee00f266c6546560