From 6c5b926c8761492f01f020e4491d98f4a0da1c45c3ced41a812c9772828d9666 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 27 Mar 2018 10:11:11 +0000 Subject: [PATCH] Accepting request 591289 from home:oertel:branches:devel:languages:python - update to 0.6.5: * Fixed import issue for Python 3.7 where several variables named "async" were, leading to syntax errors. * drop dogpile-threading.patch (upstreamed) - add dogpile.cache-tests_more_slow_waiters.patch (bsc#1086987) increase number of allowed slow waiters in testsuite otherwise this testsuite seems extremely flaky on non-x86_64 OBS-URL: https://build.opensuse.org/request/show/591289 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dogpile.cache?expand=0&rev=32 --- dogpile-threading.patch | 40 --------------------- dogpile.cache-0.6.4.tar.gz | 3 -- dogpile.cache-0.6.5.tar.gz | 3 ++ dogpile.cache-tests_more_slow_waiters.patch | 11 ++++++ python-dogpile.cache.changes | 12 +++++++ python-dogpile.cache.spec | 6 ++-- 6 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 dogpile-threading.patch delete mode 100644 dogpile.cache-0.6.4.tar.gz create mode 100644 dogpile.cache-0.6.5.tar.gz create mode 100644 dogpile.cache-tests_more_slow_waiters.patch diff --git a/dogpile-threading.patch b/dogpile-threading.patch deleted file mode 100644 index f046316..0000000 --- a/dogpile-threading.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15fe0d5285b96fcf2472d2c2cdd056b9f91a1290 Mon Sep 17 00:00:00 2001 -From: Mike Bayer -Date: Tue, 4 Jul 2017 10:21:40 -0400 -Subject: [PATCH] - ensure all threads in thread local test stay up until a - flag is set. fixes #116 - -Change-Id: Ic8f781d31ac35372f4fec06b9f98f65a750e6c2e ---- - tests/cache/test_memcached_backend.py | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/tests/cache/test_memcached_backend.py b/tests/cache/test_memcached_backend.py -index 9b83e7d..3793d27 100644 ---- a/tests/cache/test_memcached_backend.py -+++ b/tests/cache/test_memcached_backend.py -@@ -286,14 +286,18 @@ class LocalThreadTest(TestCase): - backend = MockGenericMemcachedBackend(arguments={'url': 'foo'}) - canary = [] - -- def f(): -+ flag = [False] -+ -+ def f(delay): - backend._clients.memcached - canary.append(MockClient.number_of_clients()) -- time.sleep(.05) -+ while not flag[0]: -+ time.sleep(.02) - -- threads = [Thread(target=f) for i in range(count)] -+ threads = [Thread(target=f, args=(count - i, )) for i in range(count)] - for t in threads: - t.start() -+ flag[0] = True - for t in threads: - t.join() - eq_(canary, [i + 1 for i in range(count)]) --- -2.7.4.1.g5468f9e - diff --git a/dogpile.cache-0.6.4.tar.gz b/dogpile.cache-0.6.4.tar.gz deleted file mode 100644 index 1491a24..0000000 --- a/dogpile.cache-0.6.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1 -size 315533 diff --git a/dogpile.cache-0.6.5.tar.gz b/dogpile.cache-0.6.5.tar.gz new file mode 100644 index 0000000..cc20919 --- /dev/null +++ b/dogpile.cache-0.6.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31 +size 320495 diff --git a/dogpile.cache-tests_more_slow_waiters.patch b/dogpile.cache-tests_more_slow_waiters.patch new file mode 100644 index 0000000..9cc43c8 --- /dev/null +++ b/dogpile.cache-tests_more_slow_waiters.patch @@ -0,0 +1,11 @@ +--- dogpile.cache-0.6.4/tests/test_lock.py 2018/03/17 11:48:50 1.1 ++++ dogpile.cache-0.6.4/tests/test_lock.py 2018/03/17 11:52:43 +@@ -227,6 +227,8 @@ + + if slow_write_time: + expected_slow_waiters = num_threads * expected_generations ++ # one extra for slow platforms ++ expected_slow_waiters += 2 + + # time spent also increments by one wait period in the beginning... + expected_run_time += effective_creation_time diff --git a/python-dogpile.cache.changes b/python-dogpile.cache.changes index 3d46032..c08a59d 100644 --- a/python-dogpile.cache.changes +++ b/python-dogpile.cache.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 27 00:44:45 CEST 2018 - ro@suse.de + +- update to 0.6.5: + * Fixed import issue for Python 3.7 where several variables named + "async" were, leading to syntax errors. + * drop dogpile-threading.patch (upstreamed) + +- add dogpile.cache-tests_more_slow_waiters.patch (bsc#1086987) + increase number of allowed slow waiters in testsuite + otherwise this testsuite seems extremely flaky on non-x86_64 + ------------------------------------------------------------------- Sun Feb 18 17:35:00 UTC 2018 - dmueller@suse.com diff --git a/python-dogpile.cache.spec b/python-dogpile.cache.spec index 24974de..01f3aa7 100644 --- a/python-dogpile.cache.spec +++ b/python-dogpile.cache.spec @@ -19,14 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-dogpile.cache -Version: 0.6.4 +Version: 0.6.5 Release: 0 Summary: A caching front-end based on the Dogpile lock License: BSD-3-Clause Group: Development/Languages/Python Url: http://bitbucket.org/zzzeek/dogpile.cache Source: https://pypi.io/packages/source/d/dogpile.cache/dogpile.cache-%{version}.tar.gz -Patch0: dogpile-threading.patch +Patch1: dogpile.cache-tests_more_slow_waiters.patch BuildRequires: %{python_module Mako} BuildRequires: %{python_module devel} BuildRequires: %{python_module mock} @@ -56,7 +56,7 @@ new value. %prep %setup -q -n dogpile.cache-%{version} -%patch0 -p1 +%patch1 -p1 %build %python_build