[arch-commits] Commit in python-future/trunk (3 files)

[Evangelos Foutras]

    Date: Sunday, September 20, 2015 @ 09:49:01
  Author: foutrelis
Revision: 141199

Prepare bump to latest patch release and fix tests on Python 3.5

Added:
  python-future/trunk/0001-Remove-duplicate-assertion-in-builtins-tests.patch
  python-future/trunk/remove-two-expected-failure-decorators.patch
Modified:
  python-future/trunk/PKGBUILD

---------------------------------------------------------+
 0001-Remove-duplicate-assertion-in-builtins-tests.patch |   27 ++++++++++++++
 PKGBUILD                                                |   22 ++++++++---
 remove-two-expected-failure-decorators.patch            |   20 ++++++++++
 3 files changed, 64 insertions(+), 5 deletions(-)

Added: 0001-Remove-duplicate-assertion-in-builtins-tests.patch
===================================================================
--- 0001-Remove-duplicate-assertion-in-builtins-tests.patch	                        (rev 0)
+++ 0001-Remove-duplicate-assertion-in-builtins-tests.patch	2015-09-20 07:49:01 UTC (rev 141199)
@@ -0,0 +1,27 @@
+From 39a1186ea3a7a7ad1e8225a151e682d02bafdfa9 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 20 Sep 2015 10:17:44 +0300
+Subject: [PATCH] Remove duplicate assertion in builtins tests
+
+The other instance of this assertion is commented out because it fails
+on Python 3.5; see commit 7959135e44a35de7dff4b56dcaf86d9b74d88329
+(Disable two assertions in builtins tests for Py3.5 compatibility).
+---
+ tests/test_future/test_builtins.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/test_future/test_builtins.py b/tests/test_future/test_builtins.py
+index a6db4fd..84db01e 100644
+--- a/tests/test_future/test_builtins.py
++++ b/tests/test_future/test_builtins.py
+@@ -529,7 +529,6 @@ class BuiltinTest(unittest.TestCase):
+         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
+                           mode='eval', source='0', filename='tmp')
+         compile('print("\xe5")\n', '', 'exec')
+-        self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
+         self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
+ 
+         # test the optimize argument
+-- 
+2.5.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-20 07:31:14 UTC (rev 141198)
+++ PKGBUILD	2015-09-20 07:49:01 UTC (rev 141199)
@@ -6,8 +6,8 @@
 
 pkgbase=python-future
 pkgname=(python-future python2-future)
-pkgver=0.15.1
-pkgrel=1
+pkgver=0.15.2
+pkgrel=0
 pkgdesc="Clean single-source support for Python 3 and 2"
 url="http://python-future.org/"
 arch=('any')
@@ -14,12 +14,24 @@
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools')
 options=('!emptydirs')
-source=("https://pypi.python.org/packages/source/f/future/future-$pkgver.tar.gz")
-md5sums=('e7f0acf03544be4a11452da9e337469a')
-sha256sums=('d61405f32beb357eeef6e32bbfe4c0e463cac658f59601a5ddeabf87bb8c46c1')
+source=("https://pypi.python.org/packages/source/f/future/future-$pkgver.tar.gz"
+        '0001-Remove-duplicate-assertion-in-builtins-tests.patch'
+        'remove-two-expected-failure-decorators.patch')
+md5sums=('a68eb3c90b3b76714c5ceb8c09ea3a06'
+         '0477272fe6697644053a2eb33f9f41a8'
+         'c09987e5fbee6e7520cc9f696c37dbb1')
+sha256sums=('3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97'
+            'b9be3ad81abece44b92f4ac3b931a8e2c42773f4addb8ddfb96b0783ec1335c2'
+            'cd1f918482951c6f437dc356eb87c8325e6ac34c6a9dd3af9fe546ea21bfc8fa')
 
 prepare() {
+  # https://github.com/PythonCharmers/python-future/pull/168
+  patch -d future-$pkgver -Np1 <0001-Remove-duplicate-assertion-in-builtins-tests.patch
+
   cp -a future-$pkgver{,-py2}
+
+  # Drop expected failure decorators from two tests that succeed on Python 3.5
+  patch -d future-$pkgver -Np1 <remove-two-expected-failure-decorators.patch
 }
 
 build() {

Added: remove-two-expected-failure-decorators.patch
===================================================================
--- remove-two-expected-failure-decorators.patch	                        (rev 0)
+++ remove-two-expected-failure-decorators.patch	2015-09-20 07:49:01 UTC (rev 141199)
@@ -0,0 +1,20 @@
+diff --git a/tests/test_future/test_bytes.py b/tests/test_future/test_bytes.py
+index f30e740..c261f02 100644
+--- a/tests/test_future/test_bytes.py
++++ b/tests/test_future/test_bytes.py
+@@ -534,7 +534,6 @@ class TestBytes(unittest.TestCase):
+         self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
+         self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
+ 
+-    @unittest.expectedFailure
+     def test_mod(self):
+         """
+         From Py3.5 test suite (post-PEP 461).
+@@ -551,7 +550,6 @@ class TestBytes(unittest.TestCase):
+         a = b % (b'seventy-nine', 79)
+         self.assertEqual(a, b'seventy-nine / 100 = 79%')
+ 
+-    @unittest.expectedFailure
+     def test_imod(self):
+         """
+         From Py3.5 test suite (post-PEP 461)