forked from pool/python-ujson
- Do not depend on unittest2 it is not needed:
* no-unittest2.patch - Really execute the tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ujson?expand=0&rev=11
This commit is contained in:
committed by
Git OBS Bridge
parent
4118f8c8fd
commit
3540a5ffd0
16
no-unittest2.patch
Normal file
16
no-unittest2.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
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
|
||||
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 10 11:15:14 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Do not depend on unittest2 it is not needed:
|
||||
* no-unittest2.patch
|
||||
- Really execute the tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 26 03:28:07 UTC 2017 - toddrme2178@gmail.com
|
||||
|
||||
|
@@ -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 @@ Release: 0
|
||||
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
|
||||
Patch1: no-unittest2.patch
|
||||
BuildRequires: %{python_module blist}
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module pytz}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module six}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: %{python_module devel}
|
||||
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
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@@ -50,25 +45,23 @@ decoder experience please checkout ujson4c_, based on UltraJSON.
|
||||
%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
|
||||
|
Reference in New Issue
Block a user