From f27cc94375442361c993dc444bd31bf5d756d40b Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Mar 28 2020 21:19:45 +0000 Subject: Updated to 1.17.4 --- diff --git a/.gitignore b/.gitignore index 0fa6824..71d925f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /blessed-1.14.1.tar.gz /blessed-1.15.0.tar.gz /blessed-1.16.1.tar.gz +/blessed-1.17.4.tar.gz diff --git a/el7_req_fixes.patch b/el7_req_fixes.patch index 8e9ef3b..1557732 100644 --- a/el7_req_fixes.patch +++ b/el7_req_fixes.patch @@ -1,13 +1,19 @@ -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 @@ +diff --git a/requirements.txt b/requirements.txt +index 917d2a4..dafd1c7 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,8 +1,9 @@ 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" ++#ordereddict==1.1; python_version < "2.7" + # support python2.7 by using backport of 'functools.lru_cache' +-backports.functools-lru-cache>=1.2.1; python_version < "3.2" ++#backports.functools-lru-cache>=1.2.1; python_version < "3.2" ++backports.functools-lru-cache>=1.2.1 # Windows requires jinxed -jinxed>=0.5.4; platform_system == "Windows" \ No newline at end of file -+# jinxed>=0.5.4; platform_system == "Windows" ++#jinxed>=0.5.4; platform_system == "Windows" +\ No newline at end of file \ No newline at end of file diff --git a/python-blessed.spec b/python-blessed.spec index ac23011..a39cbc9 100644 --- a/python-blessed.spec +++ b/python-blessed.spec @@ -39,8 +39,8 @@ It provides: \ %endif Name: python-%{pypi_name} -Version: 1.16.1 -Release: 3%{?dist} +Version: 1.17.4 +Release: 1%{?dist} Summary: %{summary} License: MIT @@ -63,6 +63,7 @@ BuildRequires: python2-six BuildRequires: python2-wcwidth BuildRequires: python2-mock BuildRequires: python2-pytest +BuildRequires: python2-backports-functools_lru_cache %endif %if %{with python3} @@ -94,6 +95,8 @@ Summary: %{summary} Requires: python2-six Requires: python2-wcwidth +Requires: python2-backports-functools_lru_cache + %description -n python2-%{pypi_name} %{_description} %endif @@ -162,15 +165,17 @@ rm -rf %{pypi_name}.egg-info export PYTHONIOENCODING=UTF8 export TERM=xterm-256color %if %{with python2} -%{__python2} -m pytest --strict --verbose --verbose --exitfirst +# Skip test that uses pytest.warn, since it's not supported in older versions +%{__python2} -m pytest --strict --verbose --verbose --exitfirst -c /dev/null \ +-k 'not test_unknown_preferredencoding_warned_and_fallback_ascii' %endif %if %{with python3} -%{__python3} -m pytest --strict --verbose --verbose --exitfirst +%{__python3} -m pytest --strict --verbose --verbose --exitfirst -c /dev/null %endif %if 0%{?with_python3_other} -%{__python3_other} -m pytest --strict --verbose --verbose --exitfirst +%{__python3_other} -m pytest --strict --verbose --verbose --exitfirst -c /dev/null %endif @@ -200,6 +205,9 @@ export TERM=xterm-256color %changelog +* Sat Mar 28 2020 Avram Lubkin - 1.17.4-1 +- Updated to 1.17.4 + * Thu Jan 30 2020 Fedora Release Engineering - 1.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6bc8ca8..f9488d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blessed-1.16.1.tar.gz) = a628f2e0cbebc9154568c8b72d857cfb9599e693acd1b8b15c378e9b7641bcf95ccee2db8a823e1bad8b1b17b7b27857fa81eb75388f98e8a9cfb559b0398563 +SHA512 (blessed-1.17.4.tar.gz) = 0ba64412d2de3653259400a949e800198af30d030490c22549daa816ec493aeb36bed9e1c202e13f6e514c1e63cd8aad618071641b00f7e771c95fcd7e40e31b