diff --git a/python-autopage.changes b/python-autopage.changes index 9aedab7..8a39127 100644 --- a/python-autopage.changes +++ b/python-autopage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 5 04:53:08 UTC 2024 - Steve Kowalik + +- Drop patch support-python-311.patch, no longer required. + ------------------------------------------------------------------- Fri Nov 10 13:14:47 UTC 2023 - Dirk Müller diff --git a/python-autopage.spec b/python-autopage.spec index 956bd19..1746abd 100644 --- a/python-autopage.spec +++ b/python-autopage.spec @@ -1,7 +1,7 @@ # # spec file for package python-autopage # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,6 @@ Summary: A library to provide automatic paging for console output License: Apache-2.0 URL: https://github.com/zaneb/autopage Source: https://files.pythonhosted.org/packages/source/a/autopage/autopage-%{version}.tar.gz -Patch0: support-python-311.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -62,6 +61,6 @@ rm -v autopage/tests/test_end_to_end.py %doc README.md %license LICENSE %{python_sitelib}/autopage -%{python_sitelib}/autopage-%{version}*-info +%{python_sitelib}/autopage-%{version}.dist-info %changelog diff --git a/support-python-311.patch b/support-python-311.patch deleted file mode 100644 index 6d2dccc..0000000 --- a/support-python-311.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: autopage-0.5.1/autopage/tests/test_autopage.py -=================================================================== ---- autopage-0.5.1.orig/autopage/tests/test_autopage.py -+++ autopage-0.5.1/autopage/tests/test_autopage.py -@@ -37,6 +37,9 @@ class PagedStreamTest(fixtures.TestWithF - popen = fixtures.MockPatch('subprocess.Popen') - self.useFixture(popen) - self.popen = popen.mock -+ self.encoding = 'UTF-8' -+ if sys.version_info >= (3, 11): -+ self.encoding = 'utf-8' - - def test_defaults(self) -> None: - class TestCommand(command.PagerCommand): -@@ -58,7 +61,7 @@ class PagedStreamTest(fixtures.TestWithF - env=get_env.return_value, - bufsize=-1, - universal_newlines=True, -- encoding='UTF-8', -+ encoding=self.encoding, - errors='strict', - stdin=subprocess.PIPE, - stdout=None) -@@ -84,7 +87,7 @@ class PagedStreamTest(fixtures.TestWithF - env=get_env.return_value, - bufsize=-1, - universal_newlines=True, -- encoding='UTF-8', -+ encoding=self.encoding, - errors='strict', - stdin=subprocess.PIPE, - stdout=None) -@@ -100,7 +103,7 @@ class PagedStreamTest(fixtures.TestWithF - env=get_env.return_value, - bufsize=-1, - universal_newlines=True, -- encoding='UTF-8', -+ encoding=self.encoding, - errors='strict', - stdin=subprocess.PIPE, - stdout=None)