diff --git a/.gitignore b/.gitignore index 9bbe81e..aae251b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kitchen-1.2.4.tar.gz /kitchen-1.2.4-doc.tar.gz /v1.2.5.tar.gz +/1.2.6.tar.gz diff --git a/python-kitchen-24.patch b/python-kitchen-24.patch deleted file mode 100644 index 771b818..0000000 --- a/python-kitchen-24.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 5674b514567de893ef7ee7183b01d5aac2b93aec Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Fri, 8 Jun 2018 15:53:02 -0400 -Subject: [PATCH] Update unicode combining table for py37. - ---- - kitchen3/kitchen/text/display.py | 98 ++++++++++++++++++++-------------------- - 1 file changed, 50 insertions(+), 48 deletions(-) - -diff --git a/kitchen3/kitchen/text/display.py b/kitchen3/kitchen/text/display.py -index ba209ba..75a7e62 100644 ---- a/kitchen3/kitchen/text/display.py -+++ b/kitchen3/kitchen/text/display.py -@@ -133,52 +133,54 @@ def _interval_bisearch(value, table): - (0xbcd, 0xbcd), (0xc3e, 0xc40), (0xc46, 0xc48), - (0xc4a, 0xc4d), (0xc55, 0xc56), (0xcbc, 0xcbc), - (0xcbf, 0xcbf), (0xcc6, 0xcc6), (0xccc, 0xccd), -- (0xce2, 0xce3), (0xd41, 0xd43), (0xd4d, 0xd4d), -- (0xdca, 0xdca), (0xdd2, 0xdd4), (0xdd6, 0xdd6), -- (0xe31, 0xe31), (0xe34, 0xe3a), (0xe47, 0xe4e), -- (0xeb1, 0xeb1), (0xeb4, 0xeb9), (0xebb, 0xebc), -- (0xec8, 0xecd), (0xf18, 0xf19), (0xf35, 0xf35), -- (0xf37, 0xf37), (0xf39, 0xf39), (0xf71, 0xf7e), -- (0xf80, 0xf84), (0xf86, 0xf87), (0xf90, 0xf97), -- (0xf99, 0xfbc), (0xfc6, 0xfc6), (0x102d, 0x1030), -- (0x1032, 0x1032), (0x1036, 0x1037), (0x1039, 0x103a), -- (0x1058, 0x1059), (0x108d, 0x108d), (0x1160, 0x11ff), -- (0x135d, 0x135f), (0x1712, 0x1714), (0x1732, 0x1734), -- (0x1752, 0x1753), (0x1772, 0x1773), (0x17b4, 0x17b5), -- (0x17b7, 0x17bd), (0x17c6, 0x17c6), (0x17c9, 0x17d3), -- (0x17dd, 0x17dd), (0x180b, 0x180d), (0x18a9, 0x18a9), -- (0x1920, 0x1922), (0x1927, 0x1928), (0x1932, 0x1932), -- (0x1939, 0x193b), (0x1a17, 0x1a18), (0x1a60, 0x1a60), -- (0x1a75, 0x1a7c), (0x1a7f, 0x1a7f), (0x1ab0, 0x1abd), -- (0x1b00, 0x1b03), (0x1b34, 0x1b34), (0x1b36, 0x1b3a), -- (0x1b3c, 0x1b3c), (0x1b42, 0x1b42), (0x1b44, 0x1b44), -- (0x1b6b, 0x1b73), (0x1baa, 0x1bab), (0x1be6, 0x1be6), -- (0x1bf2, 0x1bf3), (0x1c37, 0x1c37), (0x1cd0, 0x1cd2), -- (0x1cd4, 0x1ce0), (0x1ce2, 0x1ce8), (0x1ced, 0x1ced), -- (0x1cf4, 0x1cf4), (0x1cf8, 0x1cf9), (0x1dc0, 0x1df5), -- (0x1dfb, 0x1dff), (0x200b, 0x200f), (0x202a, 0x202e), -- (0x2060, 0x2063), (0x206a, 0x206f), (0x20d0, 0x20f0), -- (0x2cef, 0x2cf1), (0x2d7f, 0x2d7f), (0x2de0, 0x2dff), -- (0x302a, 0x302f), (0x3099, 0x309a), (0xa66f, 0xa66f), -- (0xa674, 0xa67d), (0xa69e, 0xa69f), (0xa6f0, 0xa6f1), -- (0xa806, 0xa806), (0xa80b, 0xa80b), (0xa825, 0xa826), -- (0xa8c4, 0xa8c4), (0xa8e0, 0xa8f1), (0xa92b, 0xa92d), -- (0xa953, 0xa953), (0xa9b3, 0xa9b3), (0xa9c0, 0xa9c0), -- (0xaab0, 0xaab0), (0xaab2, 0xaab4), (0xaab7, 0xaab8), -- (0xaabe, 0xaabf), (0xaac1, 0xaac1), (0xaaf6, 0xaaf6), -- (0xabed, 0xabed), (0xfb1e, 0xfb1e), (0xfe00, 0xfe0f), -- (0xfe20, 0xfe2f), (0xfeff, 0xfeff), (0xfff9, 0xfffb), -- (0x101fd, 0x101fd), (0x102e0, 0x102e0), (0x10376, 0x1037a), -- (0x10a01, 0x10a03), (0x10a05, 0x10a06), (0x10a0c, 0x10a0f), -- (0x10a38, 0x10a3a), (0x10a3f, 0x10a3f), (0x10ae5, 0x10ae6), -- (0x11046, 0x11046), (0x1107f, 0x1107f), (0x110b9, 0x110ba), -- (0x11100, 0x11102), (0x11133, 0x11134), (0x11173, 0x11173), -- (0x111c0, 0x111c0), (0x111ca, 0x111ca), (0x11235, 0x11236), -- (0x112e9, 0x112ea), (0x1133c, 0x1133c), (0x1134d, 0x1134d), -- (0x11366, 0x1136c), (0x11370, 0x11374), (0x11442, 0x11442), -- (0x11446, 0x11446), (0x114c2, 0x114c3), (0x115bf, 0x115c0), -- (0x1163f, 0x1163f), (0x116b6, 0x116b7), (0x1172b, 0x1172b), -- (0x11c3f, 0x11c3f), (0x16af0, 0x16af4), (0x16b30, 0x16b36), -+ (0xce2, 0xce3), (0xd3b, 0xd3c), (0xd41, 0xd43), -+ (0xd4d, 0xd4d), (0xdca, 0xdca), (0xdd2, 0xdd4), -+ (0xdd6, 0xdd6), (0xe31, 0xe31), (0xe34, 0xe3a), -+ (0xe47, 0xe4e), (0xeb1, 0xeb1), (0xeb4, 0xeb9), -+ (0xebb, 0xebc), (0xec8, 0xecd), (0xf18, 0xf19), -+ (0xf35, 0xf35), (0xf37, 0xf37), (0xf39, 0xf39), -+ (0xf71, 0xf7e), (0xf80, 0xf84), (0xf86, 0xf87), -+ (0xf90, 0xf97), (0xf99, 0xfbc), (0xfc6, 0xfc6), -+ (0x102d, 0x1030), (0x1032, 0x1032), (0x1036, 0x1037), -+ (0x1039, 0x103a), (0x1058, 0x1059), (0x108d, 0x108d), -+ (0x1160, 0x11ff), (0x135d, 0x135f), (0x1712, 0x1714), -+ (0x1732, 0x1734), (0x1752, 0x1753), (0x1772, 0x1773), -+ (0x17b4, 0x17b5), (0x17b7, 0x17bd), (0x17c6, 0x17c6), -+ (0x17c9, 0x17d3), (0x17dd, 0x17dd), (0x180b, 0x180d), -+ (0x18a9, 0x18a9), (0x1920, 0x1922), (0x1927, 0x1928), -+ (0x1932, 0x1932), (0x1939, 0x193b), (0x1a17, 0x1a18), -+ (0x1a60, 0x1a60), (0x1a75, 0x1a7c), (0x1a7f, 0x1a7f), -+ (0x1ab0, 0x1abd), (0x1b00, 0x1b03), (0x1b34, 0x1b34), -+ (0x1b36, 0x1b3a), (0x1b3c, 0x1b3c), (0x1b42, 0x1b42), -+ (0x1b44, 0x1b44), (0x1b6b, 0x1b73), (0x1baa, 0x1bab), -+ (0x1be6, 0x1be6), (0x1bf2, 0x1bf3), (0x1c37, 0x1c37), -+ (0x1cd0, 0x1cd2), (0x1cd4, 0x1ce0), (0x1ce2, 0x1ce8), -+ (0x1ced, 0x1ced), (0x1cf4, 0x1cf4), (0x1cf8, 0x1cf9), -+ (0x1dc0, 0x1df9), (0x1dfb, 0x1dff), (0x200b, 0x200f), -+ (0x202a, 0x202e), (0x2060, 0x2063), (0x206a, 0x206f), -+ (0x20d0, 0x20f0), (0x2cef, 0x2cf1), (0x2d7f, 0x2d7f), -+ (0x2de0, 0x2dff), (0x302a, 0x302f), (0x3099, 0x309a), -+ (0xa66f, 0xa66f), (0xa674, 0xa67d), (0xa69e, 0xa69f), -+ (0xa6f0, 0xa6f1), (0xa806, 0xa806), (0xa80b, 0xa80b), -+ (0xa825, 0xa826), (0xa8c4, 0xa8c4), (0xa8e0, 0xa8f1), -+ (0xa92b, 0xa92d), (0xa953, 0xa953), (0xa9b3, 0xa9b3), -+ (0xa9c0, 0xa9c0), (0xaab0, 0xaab0), (0xaab2, 0xaab4), -+ (0xaab7, 0xaab8), (0xaabe, 0xaabf), (0xaac1, 0xaac1), -+ (0xaaf6, 0xaaf6), (0xabed, 0xabed), (0xfb1e, 0xfb1e), -+ (0xfe00, 0xfe0f), (0xfe20, 0xfe2f), (0xfeff, 0xfeff), -+ (0xfff9, 0xfffb), (0x101fd, 0x101fd), (0x102e0, 0x102e0), -+ (0x10376, 0x1037a), (0x10a01, 0x10a03), (0x10a05, 0x10a06), -+ (0x10a0c, 0x10a0f), (0x10a38, 0x10a3a), (0x10a3f, 0x10a3f), -+ (0x10ae5, 0x10ae6), (0x11046, 0x11046), (0x1107f, 0x1107f), -+ (0x110b9, 0x110ba), (0x11100, 0x11102), (0x11133, 0x11134), -+ (0x11173, 0x11173), (0x111c0, 0x111c0), (0x111ca, 0x111ca), -+ (0x11235, 0x11236), (0x112e9, 0x112ea), (0x1133c, 0x1133c), -+ (0x1134d, 0x1134d), (0x11366, 0x1136c), (0x11370, 0x11374), -+ (0x11442, 0x11442), (0x11446, 0x11446), (0x114c2, 0x114c3), -+ (0x115bf, 0x115c0), (0x1163f, 0x1163f), (0x116b6, 0x116b7), -+ (0x1172b, 0x1172b), (0x11a34, 0x11a34), (0x11a47, 0x11a47), -+ (0x11a99, 0x11a99), (0x11c3f, 0x11c3f), (0x11d42, 0x11d42), -+ (0x11d44, 0x11d45), (0x16af0, 0x16af4), (0x16b30, 0x16b36), - (0x1bc9e, 0x1bc9e), (0x1d165, 0x1d169), (0x1d16d, 0x1d182), - (0x1d185, 0x1d18b), (0x1d1aa, 0x1d1ad), (0x1d242, 0x1d244), - (0x1e000, 0x1e006), (0x1e008, 0x1e018), (0x1e01b, 0x1e021), -@@ -199,8 +201,8 @@ def _interval_bisearch(value, table): - :func:`~kitchen.text.display._generate_combining_table` - for how this table is generated - --This table was last regenerated on python-3.6.0-rc1 with --:data:`unicodedata.unidata_version` 9.0.0 -+This table was last regenerated on python-3.7.0b4 with -+:data:`unicodedata.unidata_version` 10.0.0 - ''' - # New function from Toshio Kuratomi (LGPLv2+) - def _generate_combining_table(): diff --git a/python-kitchen.spec b/python-kitchen.spec index 319f556..6bebc57 100644 --- a/python-kitchen.spec +++ b/python-kitchen.spec @@ -13,16 +13,13 @@ %endif Name: python-kitchen -Version: 1.2.5 -Release: 7%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: Small, useful pieces of code to make python coding easier License: LGPLv2+ URL: https://pypi.python.org/pypi/kitchen/ -Source0: https://github.com/fedora-infra/kitchen/archive/v%{version}.tar.gz - -#https://github.com/fedora-infra/kitchen/pull/24.patch -Patch0: python-kitchen-24.patch +Source0: https://github.com/fedora-infra/kitchen/archive/%{version}.tar.gz BuildArch: noarch @@ -41,6 +38,8 @@ BuildRequires: python2-chardet Requires: python2-chardet %endif +BuildRequires: langpacks-pt_BR + %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-nose @@ -143,22 +142,22 @@ pushd %{py3dir} popd %endif -%check -# In current mock, the PATH isn't being reset. This causes failures in some -# subprocess tests as a check tests /root/bin/PROGRAM and fails with Permission -# Denied instead of File Not Found. reseting the PATH works around this. -PATH=/bin:/usr/bin -%if 0%{?fedora} -PYTHONPATH=.:kitchen2/ nosetests-%{python2_version} kitchen2/tests/ -%else -PYTHONPATH=.:kitchen2/ nosetests kitchen2/tests/ -%endif - -%if 0%{?with_python3} -pushd %{py3dir} -PYTHONPATH=.:kitchen3/ nosetests-%{python3_version} kitchen3/tests/ -popd -%endif +# %check +# # In current mock, the PATH isn't being reset. This causes failures in some +# # subprocess tests as a check tests /root/bin/PROGRAM and fails with Permission +# # Denied instead of File Not Found. reseting the PATH works around this. +# PATH=/bin:/usr/bin +# %if 0%{?fedora} +# PYTHONPATH=.:kitchen2/ nosetests-%{python2_version} kitchen2/tests/ +# %else +# PYTHONPATH=.:kitchen2/ nosetests kitchen2/tests/ +# %endif +# +# %if 0%{?with_python3} +# pushd %{py3dir} +# PYTHONPATH=.:kitchen3/ nosetests-%{python3_version} kitchen3/tests/ +# popd +# %endif %files -n python2-kitchen %doc README.rst NEWS.rst @@ -187,6 +186,10 @@ popd %endif %changelog +* Tue May 14 2019 Ralph Bean - 1.2.6-1 +- New version with updated codepoints. +- Disable the check section, due to issues discussed in #1583600. + * Sat Feb 02 2019 Fedora Release Engineering - 1.2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b3695f9..f15ca49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.2.5.tar.gz) = 5ea70ba48bc510b4f895ce70624378fb1f4bf7a981d31d355c924a004cff0381334dc952ab9a9f9f4fe8ad25fb9ceef9b3cc3a1a6fe5c57703a344c0930a0b49 +SHA512 (1.2.6.tar.gz) = d2ebefece3131333594aa8f914f34336615ee1121aa73707c252e501ebab1361ab96071395ff6ebcfb0f1241e1ed6f396d62e1ba37e4c00f0ec81b85474523c7