14
0
forked from pool/python-ujson

Accepting request 491262 from home:TheBlackCat:branches:devel:languages:python

- Implement single-spec version
- Fix source URL
- Run tests
- Add do_not_remove_build_directory_manually.patch
  This avoids deleting build directories that the single-spec macro system needs.

OBS-URL: https://build.opensuse.org/request/show/491262
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ujson?expand=0&rev=9
This commit is contained in:
Todd R
2017-04-26 14:35:08 +00:00
committed by Git OBS Bridge
parent 104f4b6c7b
commit 4118f8c8fd
3 changed files with 92 additions and 8 deletions

View File

@@ -0,0 +1,48 @@
From 39435177118c9fbc5d3863879c6e4616fd4c12c5 Mon Sep 17 00:00:00 2001
From: anthraxx <levente@leventepolyak.net>
Date: Tue, 26 Jan 2016 14:34:08 +0100
Subject: [PATCH] do not forcefully remove the build directory manually
this fixes issue #179.
setuptools should itself know when to use cache or create a
new build... however if someone wants to override that, it's
still possible but forcefully doing that on whatever
setuptools target will (and does) introduce problems.
Build directory should be cleaned up via the clean sub-command.
examples:
- clean up temp:
python setup.py clean
- clean up whole build dir
python setup.py clean -a
Or if somebody wants to, the build dir could be removed on the
shell.
---
setup.py | 6 ------
1 file changed, 6 deletions(-)
diff --git a/setup.py b/setup.py
index 1e1e220..9f9c8b6 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
except ImportError:
from distutils.core import setup, Extension
import distutils.sysconfig
-import shutil
import os.path
import re
import sys
@@ -22,11 +21,6 @@
Programming Language :: Python :: 3.2
""".splitlines()))
-try:
- shutil.rmtree("./build")
-except(OSError):
- pass
-
module1 = Extension('ujson',
sources = ['./python/ujson.c',
'./python/objToJSON.c',

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Apr 26 03:28:07 UTC 2017 - toddrme2178@gmail.com
- Implement single-spec version
- Fix source URL
- Run tests
- Add do_not_remove_build_directory_manually.patch
This avoids deleting build directories that the single-spec
macro system needs.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 16 11:52:13 UTC 2016 - jengelh@inai.de Fri Dec 16 11:52:13 UTC 2016 - jengelh@inai.de

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-ujson # spec file for package python-ujson
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,9 @@
# #
%bcond_with tests
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ujson Name: python-ujson
Version: 1.35 Version: 1.35
Release: 0 Release: 0
@@ -23,10 +26,21 @@ Summary: JSON encoder and decoder for Python
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Python Group: Development/Languages/Python
Url: http://www.esn.me Url: http://www.esn.me
Source: https://pypi.io/packages/source/u/ujson/ujson-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/u/ujson/ujson-%{version}.tar.gz
BuildRequires: python-devel # PATCH-FIX-UPSTREAM -- do_not_remove_build_directory_manually.patch -- https://github.com/esnme/ultrajson/issues/179
BuildRequires: python-setuptools Patch0: do_not_remove_build_directory_manually.patch
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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%python_subpackages
%description %description
UltraJSON is a JSON encoder and decoder written in pure C with UltraJSON is a JSON encoder and decoder written in pure C with
@@ -35,16 +49,28 @@ decoder experience please checkout ujson4c_, based on UltraJSON.
%prep %prep
%setup -q -n ujson-%{version} %setup -q -n ujson-%{version}
%patch0 -p1
%build %build
CFLAGS="%{optflags}" python setup.py build export CFLAGS="%{optflags}"
%python_build
%install %install
python setup.py install --prefix=%{_prefix} --root=%{buildroot} %python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%files %if %{with tests}
%check
pushd tests
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
$python tests.py
}
%endif
%files %{python_files}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README.rst %doc README.rst
%{python_sitearch}/* %{python_sitearch}/ujson.*
%{python_sitearch}/ujson-%{version}-py*.egg-info
%changelog %changelog