From 742f7dd9bbcf2f046e778363f4cab241d787e1de Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Apr 20 2024 18:08:35 +0000 Subject: Update to 1.20.0 --- diff --git a/.gitignore b/.gitignore index 569ff19..014f054 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /blessed-1.18.1.tar.gz /blessed-1.19.0.tar.gz /blessed-1.19.1.tar.gz +/blessed-1.20.0.tar.gz diff --git a/el6_pytest_fixes.patch b/el6_pytest_fixes.patch deleted file mode 100644 index 95e80a0..0000000 --- a/el6_pytest_fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- blessed-1.16.1.orig/blessed/tests/test_core.py 2019-09-22 21:26:02.000000000 -0400 -+++ blessed-1.16.1/blessed/tests/test_core.py 2019-10-27 21:56:44.956621958 -0400 -@@ -259,12 +259,13 @@ - import blessed.keyboard - - if hasattr(collections, 'OrderedDict'): -- monkeypatch.delattr('collections.OrderedDict') -+ monkeypatch.delattr(collections, 'OrderedDict') - - try: - reload_module(blessed.keyboard) - except ImportError as err: - assert err.args[0] in ("No module named ordereddict", # py2 -+ "cannot import name OrderedDict", #p26 - "No module named 'ordereddict'") # py3 - sys.modules['ordereddict'] = mock.Mock() - sys.modules['ordereddict'].OrderedDict = -1 -@@ -281,7 +282,7 @@ - "Test python version 3.0 through 3.2 raises an exception." - import blessed - -- monkeypatch.setattr('platform.python_version_tuple', -+ monkeypatch.setattr(platform, 'python_version_tuple', - lambda: ('3', '2', '2')) - - try: diff --git a/el6_req_fixes.patch b/el6_req_fixes.patch deleted file mode 100644 index b21c3e0..0000000 --- a/el6_req_fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ru blessed-1.16.1.orig/requirements.txt blessed-1.16.1/requirements.txt ---- blessed-1.16.1.orig/requirements.txt 2019-10-17 23:06:56.000000000 -0400 -+++ blessed-1.16.1/requirements.txt 2019-10-27 21:47:00.632633951 -0400 -@@ -1,6 +1,6 @@ - wcwidth>=0.1.4 - six>=1.9.0 - # support python2.6 by using backport of 'orderedict' --ordereddict==1.1; python_version < "2.7" -+# ordereddict==1.1; python_version < "2.7" - # Windows requires jinxed --jinxed>=0.5.4; platform_system == "Windows" -\ No newline at end of file -+# jinxed>=0.5.4; platform_system == "Windows" -diff -ru blessed-1.16.1.orig/setup.py blessed-1.16.1/setup.py ---- blessed-1.16.1.orig/setup.py 2019-10-17 23:06:56.000000000 -0400 -+++ blessed-1.16.1/setup.py 2019-10-29 11:19:38.192905838 -0400 -@@ -5,9 +5,14 @@ - - - def _get_install_requires(fname): -+ import sys - result = [req_line.strip() for req_line in open(fname) - if req_line.strip() and not req_line.startswith('#')] - -+ # support python2.6 by using backport of 'orderedict' -+ if sys.version_info < (2, 7): -+ result.append('ordereddict>=1.1') -+ - return result - - diff --git a/python-blessed.spec b/python-blessed.spec index 81fa135..c26458b 100644 --- a/python-blessed.spec +++ b/python-blessed.spec @@ -48,10 +48,6 @@ URL: https://github.com/jquast/blessed Source0: %{pypi_source} BuildArch: noarch -%if 0%{?el6} -Patch0: el6_pytest_fixes.patch -Patch2: el6_req_fixes.patch -%endif %if 0%{?el7} Patch0: el7_req_fixes.patch Patch1: el7_pytest_fixes.patch diff --git a/sources b/sources index 2e037d3..e3b1fa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blessed-1.19.1.tar.gz) = 0d899c42d7c6246362081bdc5d7dd2fcb13209fe0cee7e5a4fa342bdaf16a5cc21ab7e402bc5287ab1239f7e3afb02381e0e57e2d6111b80fe3c52b92cfa0f84 +SHA512 (blessed-1.20.0.tar.gz) = 8567ff1c55f68ad99c6c524edbf8ee57813d23d885dcb372767debc76bc2d75642c2b0491e1ed05460f023c28403b5dabb13769dea101a1c6e3156c82e0d0355