From e92c8724bf2258e287bfcee34d8973ccea43bf07e42669847c1091b4a939b783 Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Sat, 16 May 2015 15:34:18 +0000 Subject: [PATCH] Accepting request 307288 from home:benoit_monin:branches:devel:languages:python - update to version 4.1.0 - drop fix-for-upstream-test.patch: fixed upstream - delete backup files in sources - remove unwanted shebang in python file - do not set the executable bit of python files - pass -q to the test to avoid spamming the build log OBS-URL: https://build.opensuse.org/request/show/307288 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=5 --- ZODB-4.0.0.tar.gz | 3 --- ZODB-4.1.0.tar.gz | 3 +++ fix-for-upstream-test.patch | 25 ------------------------- python-ZODB.changes | 23 +++++++++++++++++++++++ python-ZODB.spec | 15 +++++++-------- 5 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 ZODB-4.0.0.tar.gz create mode 100644 ZODB-4.1.0.tar.gz delete mode 100644 fix-for-upstream-test.patch diff --git a/ZODB-4.0.0.tar.gz b/ZODB-4.0.0.tar.gz deleted file mode 100644 index cbd1e9b..0000000 --- a/ZODB-4.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5874f434c171824d70f57b2b61bfe1526f97ea019e7f9743fd72370029b7075 -size 390414 diff --git a/ZODB-4.1.0.tar.gz b/ZODB-4.1.0.tar.gz new file mode 100644 index 0000000..4dee4e8 --- /dev/null +++ b/ZODB-4.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee85731439e34994e1471a4f27fc556cc24fff58a1b4664baa9250e8bd0ee85f +size 461347 diff --git a/fix-for-upstream-test.patch b/fix-for-upstream-test.patch deleted file mode 100644 index 7de91a5..0000000 --- a/fix-for-upstream-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/ZODB/tests/testUtils.py b/src/ZODB/tests/testUtils.py -index bc3d089..17803cc 100644 ---- a/src/ZODB/tests/testUtils.py -+++ b/src/ZODB/tests/testUtils.py -@@ -20,7 +20,7 @@ from persistent import Persistent - - from zope.testing import renormalizing - from ZODB.utils import U64, p64, u64 --from ZODB._compat import loads, long -+from ZODB._compat import loads - - - NUM = 100 -@@ -35,9 +35,9 @@ checker = renormalizing.RENormalizing([ - - class TestUtils(unittest.TestCase): - -- small = [random.randrange(1, 1<<32, int=long) -+ small = [random.randrange(1, 1<<32) - for i in range(NUM)] -- large = [random.randrange(1<<32, 1<<64, int=long) -+ large = [random.randrange(1<<32, 1<<64) - for i in range(NUM)] - all = small + large - diff --git a/python-ZODB.changes b/python-ZODB.changes index d471e02..4baad84 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri May 15 10:52:45 UTC 2015 - benoit.monin@gmx.fr + +- update to version 4.1.0: + * Fix registration of custom logging level names ("BLATHER", + "TRACE). We have been registering them in the wrong order since + 2004. Before Python 3.4, the stdlib logging module masked the + error by registering them in both directions. + * Add support for Python 3.4. +- additional changes from version 4.0.1: + * Fix POSKeyError during transaction.commit when after + savepoint.rollback. see #16 + * Ensure that the pickler used in PyPy always has a persistent_id + attribute (inst_persistent_id is not present on the pure-Python + pickler). (PR #17) + * Provide better error reporting when trying to load an object on + a closed connection. +- drop fix-for-upstream-test.patch: fixed upstream +- delete backup files in sources +- remove unwanted shebang in python file +- do not set the executable bit of python files +- pass -q to the test to avoid spamming the build log + ------------------------------------------------------------------- Sat Feb 1 21:17:50 UTC 2014 - os-dev@jacraig.com diff --git a/python-ZODB.spec b/python-ZODB.spec index 00cd4fb..d605e3a 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -1,7 +1,7 @@ # # spec file for package python-ZODB # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,13 @@ Name: python-ZODB -Version: 4.0.0 +Version: 4.1.0 Release: 0 Summary: Zope Object Database: object database and persistence License: ZPL-2.1 Group: Development/Libraries/Python Url: http://www.zodb.org/ Source: https://pypi.python.org/packages/source/Z/ZODB/ZODB-%{version}.tar.gz -# PATCH-FIX-UPSTREAM fix-for-upstream-test.patch -- already fixed in git 4.0.0b3-16-g1cdf9a7 -Patch1: fix-for-upstream-test.patch BuildRequires: python-BTrees BuildRequires: python-ZConfig BuildRequires: python-persistent-devel @@ -73,18 +71,19 @@ This package contains documentation files for %{name}. %prep %setup -q -n ZODB-%{version} -%patch1 -p1 +# delete backup files +find . -name "*~" -print -delete +# remove unwanted shebang +find src -name "*.py" | xargs sed -i '1 { /^#!/ d }' %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -chmod 0755 %{buildroot}%{python_sitelib}/ZODB/scripts/{space,fsoids,fsrefs,checkbtrees,analyze,migrate}.py -chmod 0755 %{buildroot}%{python_sitelib}/ZODB/scripts/{fstest,fstail,repozo,fsstats,netspace,zodbload}.py %check -python setup.py test +python setup.py -q test %files %defattr(-,root,root)