Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2018-08-12 20:54:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ujson"
Sun Aug 12 20:54:01 2018 rev:4 rq:628597 version:1.35
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2017-04-28 09:13:55.680797012 +0200
+++ /work/SRC/openSUSE:Factory/.python-ujson.new/python-ujson.changes
2018-08-12 20:54:05.361310897 +0200
@@ -1,0 +2,7 @@
+Fri Aug 10 11:15:14 UTC 2018 - tchva...@suse.com
+
+- Do not depend on unittest2 it is not needed:
+ * no-unittest2.patch
+- Really execute the tests
+
+-------------------------------------------------------------------
New:
----
no-unittest2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ujson.spec ++++++
--- /var/tmp/diff_new_pack.PvELHj/_old 2018-08-12 20:54:06.129312456 +0200
+++ /var/tmp/diff_new_pack.PvELHj/_new 2018-08-12 20:54:06.129312456 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-ujson
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,8 +16,6 @@
#
-%bcond_with tests
-
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ujson
Version: 1.35
@@ -25,21 +23,18 @@
Summary: JSON encoder and decoder for Python
License: BSD-3-Clause
Group: Development/Languages/Python
-Url: http://www.esn.me
+URL: https://github.com/esnme/ultrajson
Source:
https://files.pythonhosted.org/packages/source/u/ujson/ujson-%{version}.tar.gz
# PATCH-FIX-UPSTREAM -- do_not_remove_build_directory_manually.patch --
https://github.com/esnme/ultrajson/issues/179
Patch0: do_not_remove_build_directory_manually.patch
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
+Patch1: no-unittest2.patch
+BuildRequires: %{python_module blist}
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module pytz}
BuildRequires: %{python_module setuptools}
-%if %{with tests}
-BuildRequires: %{python_module blist}
BuildRequires: %{python_module six}
-BuildRequires: %{python_module pytz}
-BuildRequires: python-unittest2
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
%python_subpackages
%description
@@ -50,25 +45,23 @@
%prep
%setup -q -n ujson-%{version}
%patch0 -p1
+%patch1 -p1
%build
-export CFLAGS="%{optflags}"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
%python_build
%install
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
-%if %{with tests}
%check
pushd tests
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
$python tests.py
}
-%endif
%files %{python_files}
-%defattr(-,root,root,-)
%doc README.rst
%{python_sitearch}/ujson.*
%{python_sitearch}/ujson-%{version}-py*.egg-info
++++++ no-unittest2.patch ++++++
Index: ujson-1.35/tests/tests.py
===================================================================
--- ujson-1.35.orig/tests/tests.py
+++ ujson-1.35/tests/tests.py
@@ -11,10 +11,7 @@ import json
import math
import time
import pytz
-if six.PY2:
- import unittest2 as unittest
-else:
- import unittest
+import unittest
import ujson
