commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2020-08-03 14:18:18
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.3592 (New)
Package is "python-ujson"
Mon Aug 3 14:18:18 2020 rev:10 rq:824027 version:3.1.0
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2020-06-15 20:29:22.750139156 +0200
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.3592/python-ujson.changes
2020-08-03 14:19:00.380716916 +0200
@@ -1,0 +2,7 @@
+Mon Aug 3 05:24:24 UTC 2020 - Steve Kowalik
+
+- Update to 3.1.0:
+ * PEP 489 Multi Phase Init support (#418) @WillAyd
+ * PyPy3 test fixes (#413) @mgorny
+
+---
Old:
ujson-3.0.0.tar.gz
New:
ujson-3.1.0.tar.gz
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.4R9H9V/_old 2020-08-03 14:19:02.692719235 +0200
+++ /var/tmp/diff_new_pack.4R9H9V/_new 2020-08-03 14:19:02.696719239 +0200
@@ -19,11 +19,10 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global skip_python2 1
Name: python-ujson
-Version:3.0.0
+Version:3.1.0
Release:0
Summary:JSON encoder and decoder for Python
License:BSD-3-Clause
-Group: Development/Languages/Python
URL:https://github.com/esnme/ultrajson
Source:
https://files.pythonhosted.org/packages/source/u/ujson/ujson-%{version}.tar.gz
# unbundle double-conversion
(https://github.com/ultrajson/ultrajson/issues/375)
++ ujson-3.0.0.tar.gz -> ujson-3.1.0.tar.gz ++
/work/SRC/openSUSE:Factory/python-ujson/ujson-3.0.0.tar.gz
/work/SRC/openSUSE:Factory/.python-ujson.new.3592/ujson-3.1.0.tar.gz differ:
char 5, line 1
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2020-06-15 20:29:16
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.3606 (New)
Package is "python-ujson"
Mon Jun 15 20:29:16 2020 rev:9 rq:814556 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2020-03-29 14:27:50.378163286 +0200
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.3606/python-ujson.changes
2020-06-15 20:29:22.750139156 +0200
@@ -1,0 +2,14 @@
+Sun Jun 14 09:36:42 UTC 2020 - Dirk Mueller
+
+- update to 3.0.0:
+ * Build Windows, macOS and manylinux wheels on CI and deploy to PyPI
+ * Breaking change: New reject_bytes option to raise on bytes,
+ defaults to True to align with json library. Set to False for
+ old behaviour (#266) @elelay
+ * Breaking change: Add an allow_nan keyword argument to dumps,
+ defaults to True to align with json library. Set to False for old
+ behaviour (#327) @segfault
+ Specify setuptools_scm config in pyproject.toml (#399) @BenjaminSchubert
+ * Remove python 2.x support
+
+---
Old:
ujson-2.0.3.tar.gz
New:
ujson-3.0.0.tar.gz
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.1GqF5g/_old 2020-06-15 20:29:26.090150727 +0200
+++ /var/tmp/diff_new_pack.1GqF5g/_new 2020-06-15 20:29:26.098150754 +0200
@@ -17,8 +17,9 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%global skip_python2 1
Name: python-ujson
-Version:2.0.3
+Version:3.0.0
Release:0
Summary:JSON encoder and decoder for Python
License:BSD-3-Clause
++ ujson-2.0.3.tar.gz -> ujson-3.0.0.tar.gz ++
/work/SRC/openSUSE:Factory/python-ujson/ujson-2.0.3.tar.gz
/work/SRC/openSUSE:Factory/.python-ujson.new.3606/ujson-3.0.0.tar.gz differ:
char 5, line 1
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2020-03-29 14:27:45
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.3160 (New)
Package is "python-ujson"
Sun Mar 29 14:27:45 2020 rev:8 rq:789362 version:2.0.3
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2020-03-20 23:54:01.176817362 +0100
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.3160/python-ujson.changes
2020-03-29 14:27:50.378163286 +0200
@@ -1,0 +2,12 @@
+Sat Mar 28 16:22:49 UTC 2020 - Arun Persaud
+
+- update to version 2.0.3:
+ * Changed
++ Drop legacy distutils in setup.py (#397) @hugovk
++ Update benchmarking (#395) @hugovk
+ * Fixed
++ Decrease dict key reference (#394) @suola
++ Remove double_precision and precise_float from help text (#389)
+ @JTJL
+
+---
Old:
ujson-2.0.2.tar.gz
New:
ujson-2.0.3.tar.gz
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.i9V2Rj/_old 2020-03-29 14:27:51.994164112 +0200
+++ /var/tmp/diff_new_pack.i9V2Rj/_new 2020-03-29 14:27:51.994164112 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ujson
-Version:2.0.2
+Version:2.0.3
Release:0
Summary:JSON encoder and decoder for Python
License:BSD-3-Clause
++ ujson-2.0.2.tar.gz -> ujson-2.0.3.tar.gz ++
/work/SRC/openSUSE:Factory/python-ujson/ujson-2.0.2.tar.gz
/work/SRC/openSUSE:Factory/.python-ujson.new.3160/ujson-2.0.3.tar.gz differ:
char 5, line 1
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2020-03-20 23:53:58
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.3160 (New)
Package is "python-ujson"
Fri Mar 20 23:53:58 2020 rev:7 rq:785415 version:2.0.2
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2020-03-11 18:51:22.851568496 +0100
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.3160/python-ujson.changes
2020-03-20 23:54:01.176817362 +0100
@@ -1,0 +2,7 @@
+Sun Mar 15 19:44:07 UTC 2020 - Benjamin Greiner
+
+- update to version 2.0.2
+ Fix serialization issue (#382)
+- reactivate Python 2 build
+
+---
Old:
ujson-2.0.1.tar.gz
New:
_service
ujson-2.0.2.tar.gz
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.NyWcRq/_old 2020-03-20 23:54:04.572819515 +0100
+++ /var/tmp/diff_new_pack.NyWcRq/_new 2020-03-20 23:54:04.576819518 +0100
@@ -17,9 +17,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
Name: python-ujson
-Version:2.0.1
+Version:2.0.2
Release:0
Summary:JSON encoder and decoder for Python
License:BSD-3-Clause
@@ -42,9 +41,8 @@
%python_subpackages
%description
-UltraJSON is a JSON encoder and decoder written in pure C with
-bindings for Python 2.5+ and 3. For a different C/C++ JSON
-decoder experience please checkout ujson4c_, based on UltraJSON.
+An ultrafast JSON encoder and decoder written in pure C with
+bindings for Python 2.7 and 3.5+
%prep
%setup -q -n ujson-%{version}
++ _service ++
++ ujson-2.0.1.tar.gz -> ujson-2.0.2.tar.gz ++
/work/SRC/openSUSE:Factory/python-ujson/ujson-2.0.1.tar.gz
/work/SRC/openSUSE:Factory/.python-ujson.new.3160/ujson-2.0.2.tar.gz differ:
char 5, line 1
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2020-03-11 18:49:28
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.3160 (New)
Package is "python-ujson"
Wed Mar 11 18:49:28 2020 rev:6 rq:783436 version:2.0.1
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2019-05-13 14:52:33.735094321 +0200
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.3160/python-ujson.changes
2020-03-11 18:51:22.851568496 +0100
@@ -1,0 +2,60 @@
+Tue Mar 10 13:37:34 UTC 2020 - pgaj...@suse.com
+
+- version update to 2.0.1
+ Added
+Include license file in manifest (#288) @kszucs
+added "static" to C functions, where possible (#238) @WGH-
+bring back benchmark introduction (#234) @rdpate
+Add syntax highlighting to README (#255) @adamchainz
+Test on new Travis CPUs (#350) @hugovk
+Test on GitHub Actions (#348) @hugovk
+Test on Python 3.9-dev to avoid surprises (#349) @hugovk
+Use Release Drafter to draft releases (#365) @hugovk
+Deploy from GitHub Actions instead of Travis CI (#364) @hugovk
+Autodeploy to PyPI from Travis CI (#357) @hugovk
+Lint with pre-commit: Black, isort, Flake8 (#354) @hugovk
+ Changed
+Use Google's double-conversion lib to fix floating-point precision when
converting doubles to and from strings, improves double encoding by 4-5x
(eb7d894) @Jahaja
+Reduce default buffer on stack size (#281) @ncopa
+Update ultrajsondec.c (#260) @markpiekarz
+Indent dict values (#217) @orivej
+Test with pytest (#363) @hugovk
+Less Travis (#361) @hugovk
+Update links (#356) @hugovk
+Tests: Remove unused, unmaintained blist (#362) @hugovk
+Only deploy sdist from Travis CI (#359) @hugovk
+ Removed
+Drop EOL Python 2.5-2.6, 3.2-3.4 and add 3.7-3.8 (#298) @hugovk
+Remove serialization of date/datetime objects (50181f0) @Jahaja
+Remove double_precision encoding option and precise_float decoding option
(eb7d894) @Jahaja
+Remove generic serialization of objects/iterables (53f85b1) @Jahaja
+Remove support for __json__ method on str (5f98f01) @Jahaja
+Remove blist tests (3a6ba52) @Jahaja
+ Fixed
+Fix for sort_keys bug and a typo (870ee48) @Jahaja
+Fix for overflowing long causing invalid JSON (409c6d4) @Jahaja
+Following std JSON handling of None dict key (ac4637f)
+Fix for incorrect order when using OrderedDict (c9f8318) @Jahaja
+Fix reference counting bug for dict values (#353) @richafrank
+Fix a couple of memory leaks. (#257) @borman
+Correct JSON decoding implementation to die on trailing commas in Objects
(#323) @timdawborn
+fixup dconv_wrapper linkage (#312) @tclh123
+Fix Warning: 'classifiers' should be a list, got type 'filter' (#351)
@hugovk
+Remove redundant license parameter (#341) @blag
+do not forcefully remove the build directory manually (fix #179) (#207)
@anthraxx
+Merged pull request to fix memory leak. (#1) @Adriandorr
+http -> https (#299) @hugovk
+- added patches
+ fix unbundle double-conversion
+ + python-ujson-system-double-conversion.patch
+- deleted patches
+ - do_not_remove_build_directory_manually.patch (upstreamed)
+ - no-unittest2.patch (upstreamed)
+ - ujson-1.35-fix-for-overflowing-long.patch (upstreamed)
+ - ujson-1.35-fix-ordering-of-orderdict.patch (upstreamed)
+ - ujson-1.35-sort_keys-segfault.patch (upstreamed)
+ - ujson-1.35-standard-handling-of-none.patch (upstreamed)
+ - ujson-1.35-test-depricationwarning.patch (upstreamed)
+ - ujson-1.35-use-static-where-possible.patch (upstreamed)
+
+---
Old:
do_not_remove_build_directory_manually.patch
no-unittest2.patch
ujson-1.35-fix-for-overflowing-long.patch
ujson-1.35-fix-ordering-of-orderdict.patch
ujson-1.35-sort_keys-segfault.patch
ujson-1.35-standard-handling-of-none.patch
ujson-1.35-test-depricationwarning.patch
ujson-1.35-use-static-where-possible.patch
ujson-1.35.tar.gz
New:
python-ujson-system-double-conversion.patch
ujson-2.0.1.tar.gz
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.MTnv9d/_old 2020-03-11 18:51:23.751568899 +0100
+++ /var/tmp/diff_new_pack.MTnv9d/_new 2020-03-11 18:51:23.755568900 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-ujson
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,29 +17,27 @@
%{?!python_module:%define
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2019-05-13 14:52:32
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new.5148 (New)
Package is "python-ujson"
Mon May 13 14:52:32 2019 rev:5 rq:702495 version:1.35
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2018-08-12 20:54:05.361310897 +0200
+++ /work/SRC/openSUSE:Factory/.python-ujson.new.5148/python-ujson.changes
2019-05-13 14:52:33.735094321 +0200
@@ -1,0 +2,11 @@
+Sun May 12 13:09:01 UTC 2019 - John Vandenberg
+
+- Apply six patches from Gentoo:
+ * ujson-1.35-fix-for-overflowing-long.patch
+ * ujson-1.35-fix-ordering-of-orderdict.patch
+ * ujson-1.35-sort_keys-segfault.patch
+ * ujson-1.35-standard-handling-of-none.patch
+ * ujson-1.35-test-depricationwarning.patch
+ * ujson-1.35-use-static-where-possible.patch
+
+---
New:
ujson-1.35-fix-for-overflowing-long.patch
ujson-1.35-fix-ordering-of-orderdict.patch
ujson-1.35-sort_keys-segfault.patch
ujson-1.35-standard-handling-of-none.patch
ujson-1.35-test-depricationwarning.patch
ujson-1.35-use-static-where-possible.patch
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.7BuJUr/_old 2019-05-13 14:52:37.203103052 +0200
+++ /var/tmp/diff_new_pack.7BuJUr/_new 2019-05-13 14:52:37.207103062 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-ujson
#
-# 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -28,6 +28,12 @@
# 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
+Patch2: ujson-1.35-fix-for-overflowing-long.patch
+Patch3: ujson-1.35-fix-ordering-of-orderdict.patch
+Patch4: ujson-1.35-sort_keys-segfault.patch
+Patch5: ujson-1.35-standard-handling-of-none.patch
+Patch6: ujson-1.35-test-depricationwarning.patch
+Patch7: ujson-1.35-use-static-where-possible.patch
BuildRequires: %{python_module blist}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pytz}
@@ -44,8 +50,7 @@
%prep
%setup -q -n ujson-%{version}
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
++ ujson-1.35-fix-for-overflowing-long.patch ++
commit 409c6d4006fdea27e746ea397124f98c92a41a92
Author: Joakim Hamren
Date: Sat Feb 4 04:21:05 2017 +0100
Fix for overflowing long causing invalid json
This was caused by checking for "__json__" using PyObject_HasAttrString
which clears the error set by a previous long overflow. Thus this was
dependent
on the order of processing of dict items, which explains why it was
seemingly random as the dict items are likely ordered by a hash of
the key.
This fixes GH224 and GH240.
Index: ujson-1.35/python/objToJSON.c
===
--- ujson-1.35.orig/python/objToJSON.c
+++ ujson-1.35/python/objToJSON.c
@@ -226,6 +226,21 @@ static void *PyDateToINT64(JSOBJ _obj, J
return NULL;
}
+static int PyHasAttrStringPreserveErr(PyObject *obj, const char *attr)
+{
+ int res;
+ PyObject *excType = NULL, *excValue, *excTraceback;
+
+ if (!PyErr_Occurred())
+return PyObject_HasAttrString(obj, "__json__");
+
+ PyErr_Fetch(&excType, &excValue, &excTraceback);
+ res = PyObject_HasAttrString(obj, "__json__");
+ PyErr_Restore(excType, excValue, excTraceback);
+
+ return res;
+}
+
int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
{
PyObject *item;
@@ -471,21 +486,21 @@ int Dict_iterNext(JSOBJ obj, JSONTypeCon
GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
}
else
-if (!PyString_Check(GET_TC(tc)->itemName))
-{
- GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
+ if (!PyString_Check(GET_TC(tc)->itemName))
+ {
+GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
#if PY_MAJOR_VERSION >= 3
- itemNameTmp = GET_TC(tc)->itemName;
- GET_T
commit python-ujson for openSUSE:Factory
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
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2017-04-28 09:13:51
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new (New)
Package is "python-ujson"
Fri Apr 28 09:13:51 2017 rev:3 rq:491263 version:1.35
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2017-02-03 18:58:32.691870116 +0100
+++ /work/SRC/openSUSE:Factory/.python-ujson.new/python-ujson.changes
2017-04-28 09:13:55.680797012 +0200
@@ -1,0 +2,10 @@
+Wed Apr 26 03:28:07 UTC 2017 - toddrme2...@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.
+
+---
New:
do_not_remove_build_directory_manually.patch
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.N2OwwK/_old 2017-04-28 09:13:56.312707902 +0200
+++ /var/tmp/diff_new_pack.N2OwwK/_new 2017-04-28 09:13:56.316707338 +0200
@@ -1,7 +1,7 @@
#
# 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
# 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
Version:1.35
Release:0
@@ -23,10 +26,21 @@
License:BSD-3-Clause
Group: Development/Languages/Python
Url:http://www.esn.me
-Source: https://pypi.io/packages/source/u/ujson/ujson-%{version}.tar.gz
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+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
+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
UltraJSON is a JSON encoder and decoder written in pure C with
@@ -35,16 +49,28 @@
%prep
%setup -q -n ujson-%{version}
+%patch0 -p1
%build
-CFLAGS="%{optflags}" python setup.py build
+export CFLAGS="%{optflags}"
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%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
+%files %{python_files}
%defattr(-,root,root,-)
%doc README.rst
-%{python_sitearch}/*
+%{python_sitearch}/ujson.*
+%{python_sitearch}/ujson-%{version}-py*.egg-info
%changelog
++ do_not_remove_build_directory_manually.patch ++
>From 39435177118c9fbc5d3863879c6e4616fd4c12c5 Mon Sep 17 00:00:00 2001
From: anthraxx
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',
commit python-ujson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-ujson for openSUSE:Factory
checked in at 2017-01-29 10:38:16
Comparing /work/SRC/openSUSE:Factory/python-ujson (Old)
and /work/SRC/openSUSE:Factory/.python-ujson.new (New)
Package is "python-ujson"
Changes:
--- /work/SRC/openSUSE:Factory/python-ujson/python-ujson.changes
2017-01-19 10:42:58.732455398 +0100
+++ /work/SRC/openSUSE:Factory/.python-ujson.new/python-ujson.changes
2017-02-03 18:58:32.691870116 +0100
@@ -1,0 +2,5 @@
+Fri Dec 16 11:52:13 UTC 2016 - jeng...@inai.de
+
+- Replace filler words in description
+
+---
Other differences:
--
++ python-ujson.spec ++
--- /var/tmp/diff_new_pack.2Z1hqb/_old 2017-02-03 18:58:32.971830797 +0100
+++ /var/tmp/diff_new_pack.2Z1hqb/_new 2017-02-03 18:58:32.971830797 +0100
@@ -19,7 +19,7 @@
Name: python-ujson
Version:1.35
Release:0
-Summary:Ultra fast JSON encoder and decoder for Python
+Summary:JSON encoder and decoder for Python
License:BSD-3-Clause
Group: Development/Languages/Python
Url:http://www.esn.me
@@ -29,8 +29,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-UltraJSON is an ultra fast JSON encoder and decoder written in pure C with
-bindings for Python 2.5+ and 3. For a more painless day to day C/C++ JSON
+UltraJSON is a JSON encoder and decoder written in pure C with
+bindings for Python 2.5+ and 3. For a different C/C++ JSON
decoder experience please checkout ujson4c_, based on UltraJSON.
%prep
