diff --git a/.gitignore b/.gitignore index e9ebaba..7f63247 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /python-future-0.15.2.tar.gz /python-future-0.16.0.tar.gz /python-future-af02ef69e8a659c49da96243befc4a6b8c19a177.tar.gz +/python-future-bee0f3bcb8ba9e7bd131d64e3bf631f5bd06c5b4.tar.gz diff --git a/future-skip_failed_tests.patch b/future-skip_failed_tests.patch deleted file mode 100644 index c53a18e..0000000 --- a/future-skip_failed_tests.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tests/test_future/test_bytes.orig.py 2018-09-21 12:56:18.751957000 +0200 -+++ tests/test_future/test_bytes.py 2018-09-21 13:05:30.305475865 +0200 -@@ -566,8 +566,8 @@ - - self.assertEqual(bytes(b'%(foo)s') % d, b'bar') - -- @unittest.skipUnless(utils.PY35 or utils.PY2, -- 'test requires Python 2 or 3.5+') -+ @unittest.skipUnless(utils.PY2, -+ 'test requires Python 2') - def test_mod_more(self): - self.assertEqual(b'%s' % b'aaa', b'aaa') - self.assertEqual(bytes(b'%s') % b'aaa', b'aaa') ---- tests/test_future/test_urllibnet.orig.py 2018-09-21 12:56:18.776957000 +0200 -+++ tests/test_future/test_urllibnet.py 2018-09-21 13:10:20.556181363 +0200 -@@ -109,7 +109,7 @@ - - # On Windows, socket handles are not file descriptors; this - # test can't pass on Windows. -- @unittest.skipIf(sys.platform in ('win32',), 'not appropriate for Windows') -+ @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...") - @skip26 - def test_fileno(self): - # Make sure fd returned by fileno is valid. diff --git a/future.spec b/future.spec index 494e7c5..3163081 100644 --- a/future.spec +++ b/future.spec @@ -22,14 +22,14 @@ %global with_python2 1 %endif -%global commit af02ef69e8a659c49da96243befc4a6b8c19a177 -%global date 20180917 +%global commit bee0f3bcb8ba9e7bd131d64e3bf631f5bd06c5b4 +%global date 20181019 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: future Summary: Easy, clean, reliable Python 2/3 compatibility Version: 0.16.0 -Release: 12.%{date}git%{shortcommit}%{?dist} +Release: 13.%{date}git%{shortcommit}%{?dist} License: MIT URL: http://python-future.org/ Source0: https://github.com/PythonCharmers/python-future/archive/%{commit}/python-%{name}-%{commit}.tar.gz @@ -38,9 +38,6 @@ BuildArch: noarch ##https://github.com/PythonCharmers/python-future/issues/165 Patch0: %{name}-skip_tests_with_connection_errors.patch -##Skip failed tests with Python 3.5+ -Patch1: %{name}-skip_failed_tests.patch - %if 0%{?with_python3_other} BuildRequires: python%{python3_other_pkgversion}-devel %endif @@ -138,16 +135,11 @@ popd %if 0%{?with_python2} cp -a python-future-%{commit} python2 -pushd python2 -find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' -popd +find python2 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' %endif %if 0%{?with_python3} cp -a python-future-%{commit} python3 -pushd python3 -%patch1 -p0 -popd find python3 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %endif # with_python3 @@ -324,6 +316,10 @@ popd %changelog +* Wed Oct 24 2018 Antonio Trande - 0.16.0-13.20181019gitbee0f3b +- Update to the commit #bee0f3b +- Perform all Python3 tests + * Fri Sep 21 2018 Antonio Trande - 0.16.0-12.20180917gitaf02ef6 - Update to the commit #af02ef6 diff --git a/sources b/sources index 2074b88..74f44d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-future-af02ef69e8a659c49da96243befc4a6b8c19a177.tar.gz) = 75154c16cb779dcbfbded7ab5ab59b0696d61466f04e4e99c71e6f7ea71cbd4a05adb3fc002121eb46b99e2777463ec1e2f4aac0dc20b860512558ad7ade60be +SHA512 (python-future-bee0f3bcb8ba9e7bd131d64e3bf631f5bd06c5b4.tar.gz) = 28b521b5a11a913089592f865216eae7819f2f6a9df50cdfb9e459ab11efa14552edf9dc3c4bf0c71409bc8f736ffda88cfd787a3bc1798f4a65c0da3f6f9057