From c44e4db7f561f8abd034ce21765b5ec5bd6b0d2616811f5db02bc450bb5ea118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 7 Mar 2019 13:31:35 +0000 Subject: [PATCH] - Update to 1.04: * include license * python3 compat - Drop merged cooldict_python3.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cooldict?expand=0&rev=8 --- LICENSE | 24 ------------------------ cooldict-1.02.tar.gz | 3 --- cooldict-1.04.tar.gz | 3 +++ cooldict_python3.patch | 38 -------------------------------------- python-cooldict.changes | 8 ++++++++ python-cooldict.spec | 13 +++++++------ 6 files changed, 18 insertions(+), 71 deletions(-) delete mode 100644 LICENSE delete mode 100644 cooldict-1.02.tar.gz create mode 100644 cooldict-1.04.tar.gz delete mode 100644 cooldict_python3.patch diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c408f37..0000000 --- a/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2015, The Regents of the University of California -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/cooldict-1.02.tar.gz b/cooldict-1.02.tar.gz deleted file mode 100644 index 732c151..0000000 --- a/cooldict-1.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03692d336f9c3f21202cc6d9650f9671d73a5ea5cf3800af35a7105034709120 -size 4745 diff --git a/cooldict-1.04.tar.gz b/cooldict-1.04.tar.gz new file mode 100644 index 0000000..29f1a83 --- /dev/null +++ b/cooldict-1.04.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c43c9e0b4ad4e21ec8efae9f10e640c3785ac1a69ed32db9ba7f92cf52a91159 +size 5619 diff --git a/cooldict_python3.patch b/cooldict_python3.patch deleted file mode 100644 index 06a741f..0000000 --- a/cooldict_python3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 516fd5a87f0332444b6bf055bb755f28e1c7c9fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20F=C3=A4rber?= -Date: Sun, 15 Apr 2018 13:16:35 +0200 -Subject: [PATCH] Fix Python3 SyntaxError -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Python 3.6 emits the following error: - - File "/usr/lib/python3.6/site-packages/cooldict.py", line 577 - print da[10] - ^ - SyntaxError: Missing parentheses in call to 'print'. Did you mean print(da[10])? - -Address this by adding the suggested parentheses. - -Signed-off-by: Andreas Färber ---- - cooldict.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cooldict.py b/cooldict.py -index 27bcb5c..e070714 100644 ---- a/cooldict.py -+++ b/cooldict.py -@@ -574,7 +574,7 @@ def test(): - l.info("Testing SinkholeCOWDict") - da = SinkholeCOWDict() - try: -- print da[10] -+ print(da[10]) - assert False - except KeyError: - pass --- -2.16.3 - diff --git a/python-cooldict.changes b/python-cooldict.changes index 204f926..0afaa7a 100644 --- a/python-cooldict.changes +++ b/python-cooldict.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 7 13:24:35 UTC 2019 - Tomáš Chvátal + +- Update to 1.04: + * include license + * python3 compat +- Drop merged cooldict_python3.patch + ------------------------------------------------------------------- Tue Dec 4 12:46:55 UTC 2018 - Matej Cepl diff --git a/python-cooldict.spec b/python-cooldict.spec index cea74fa..e1f3611 100644 --- a/python-cooldict.spec +++ b/python-cooldict.spec @@ -1,7 +1,7 @@ # # spec file for package python-cooldict # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-cooldict -Version: 1.02 +Version: 1.04 Release: 0 Summary: dict-like structures for Python License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/zardus/cooldict Source: https://files.pythonhosted.org/packages/source/c/cooldict/cooldict-%{version}.tar.gz -Source1: https://github.com/zardus/cooldict/raw/master/LICENSE -Patch1: cooldict_python3.patch BuildRequires: %{python_module ana >= 0.1} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -45,8 +43,6 @@ cooldict provides some dict-like structures for Python, such as %prep %setup -q -n cooldict-%{version} -%patch1 -p1 -[ -e LICENSE ] || cp %{SOURCE1} LICENSE %build %python_build @@ -55,8 +51,13 @@ cooldict provides some dict-like structures for Python, such as %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +# Well there is a test, but it does not work even on the git, so skip for now +#%python_exec cooldict.py + %files %{python_files} %license LICENSE +%doc README.md %{python_sitelib}/* %changelog