commit python-python-cjson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-python-cjson for
openSUSE:Factory checked in at 2020-08-06 10:42:28
Comparing /work/SRC/openSUSE:Factory/python-python-cjson (Old)
and /work/SRC/openSUSE:Factory/.python-python-cjson.new.3399 (New)
Package is "python-python-cjson"
Thu Aug 6 10:42:28 2020 rev:4 rq:824584 version:1.2.2
Changes:
--- /work/SRC/openSUSE:Factory/python-python-cjson/python-python-cjson.changes
2020-05-01 11:12:52.331784683 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-cjson.new.3399/python-python-cjson.changes
2020-08-06 10:42:35.782134348 +0200
@@ -1,0 +2,13 @@
+Wed Aug 5 14:50:03 UTC 2020 - Marketa Calabkova
+
+- Update to 1.2.2
+* Fix encoding of UTF-16 surrogate pairs
+* Made MANIFEST.in more explicit
+* Refactored setup.py to be PEP-8 compliant
+* Pass command line arguments from build_inplace to setup.py
+* Cleanup after build_inplace
+* Explicitly use python2 in shebang lines
+* Updated license
+- Rebase py3.patch
+
+---
Old:
python-cjson-1.2.1.tar.gz
New:
python-cjson-1.2.2.tar.gz
Other differences:
--
++ python-python-cjson.spec ++
--- /var/tmp/diff_new_pack.Ix8858/_old 2020-08-06 10:42:37.262135090 +0200
+++ /var/tmp/diff_new_pack.Ix8858/_new 2020-08-06 10:42:37.266135092 +0200
@@ -19,10 +19,10 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-python-cjson
-Version:1.2.1
+Version:1.2.2
Release:0
Summary:C-accelerated JSON encoder/decoder for Python
-License:LGPL-2.0-or-later
+License:LGPL-2.1-or-later
Group: Development/Languages/Python
URL:https://github.com/AGProjects/python-cjson
Source:
https://files.pythonhosted.org/packages/source/p/python-cjson/python-cjson-%{version}.tar.gz
++ py3.patch ++
--- /var/tmp/diff_new_pack.Ix8858/_old 2020-08-06 10:42:37.290135104 +0200
+++ /var/tmp/diff_new_pack.Ix8858/_new 2020-08-06 10:42:37.294135106 +0200
@@ -8,10 +8,10 @@
jsontest.py | 16 ++--
2 files changed, 144 insertions(+), 140 deletions(-)
-diff --git a/cjson.c b/cjson.c
-index d3ecc81..a44e7e4 100644
a/cjson.c
-+++ b/cjson.c
+Index: python-cjson-1.2.2/cjson.c
+===
+--- python-cjson-1.2.2.orig/cjson.c
python-cjson-1.2.2/cjson.c
@@ -8,6 +8,16 @@
#include
#include
@@ -96,11 +96,10 @@
Py_DECREF(str);
-@@ -579,75 +594,6 @@ decode_json(JSONData *jsondata)
-
+@@ -580,75 +595,6 @@ decode_json(JSONData *jsondata)
/* -- Encoding - */
--/*
+ /*
- * This function is an almost verbatim copy of PyString_Repr() from
- * Python's stringobject.c with the following differences:
- *
@@ -169,9 +168,10 @@
-}
-}
-
- /*
+-/*
* This function is an almost verbatim copy of unicodeescape_string() from
* Python's unicodeobject.c with the following differences:
+ *
@@ -662,7 +608,7 @@ encode_unicode(PyObject *unicode)
PyObject *repr;
Py_UNICODE *s;
@@ -204,7 +204,7 @@
*p++ = '\\';
*p++ = (char) ch;
continue;
-@@ -801,10 +747,11 @@ encode_unicode(PyObject *unicode)
+@@ -782,10 +728,11 @@ encode_unicode(PyObject *unicode)
*p++ = (char) ch;
}
@@ -218,7 +218,7 @@
return repr;
}
-@@ -825,9 +772,9 @@ encode_tuple(PyObject *tuple)
+@@ -806,9 +753,9 @@ encode_tuple(PyObject *tuple)
PyObject *pieces, *result = NULL;
PyTupleObject *v = (PyTupleObject*) tuple;
@@ -230,7 +230,7 @@
pieces = PyTuple_New(n);
if (pieces == NULL)
-@@ -843,29 +790,29 @@ encode_tuple(PyObject *tuple)
+@@ -824,29 +771,29 @@ encode_tuple(PyObject *tuple)
/* Add "[]" decorations to the first and last items. */
assert(n > 0);
@@ -266,7 +266,7 @@
Py_DECREF(s);
Done:
-@@ -899,8 +846,8 @@ encode_list(PyObject *list)
+@@ -880,8 +827,8 @@ encode_list(PyObject *list)
return NULL;
}
@@ -277,7 +277,7 @@
goto Done;
}
-@@ -910,7 +857,7 @@ encode_list(PyObject *list)
+@@ -891,7 +838,7 @@ encode_list(PyObject *list)
/* Do repr() on each element. Note that this may mutate the list,
* so must refetch the list size on each iteration. */
@@ -286,7 +286,7 @@
int status;
s = encode_object(v->ob_item[i]);
if (s == NULL)
-@@ -923,29 +870,29 @@ encode_list(PyObject *list)
+@@ -904,29 +851,29 @@ encode_list(PyObject *list)
/* Add "[]" decorations to the first and last items. */
as
commit python-python-cjson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-python-cjson for
openSUSE:Factory checked in at 2020-05-01 11:12:42
Comparing /work/SRC/openSUSE:Factory/python-python-cjson (Old)
and /work/SRC/openSUSE:Factory/.python-python-cjson.new.2738 (New)
Package is "python-python-cjson"
Fri May 1 11:12:42 2020 rev:3 rq:799132 version:1.2.1
Changes:
--- /work/SRC/openSUSE:Factory/python-python-cjson/python-python-cjson.changes
2019-06-19 21:03:07.938226926 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-cjson.new.2738/python-python-cjson.changes
2020-05-01 11:12:52.331784683 +0200
@@ -1,0 +2,5 @@
+Thu Apr 30 07:26:40 UTC 2020 - Tomáš Chvátal
+
+- Fix build without python2
+
+---
Other differences:
--
++ python-python-cjson.spec ++
--- /var/tmp/diff_new_pack.Kh1yjM/_old 2020-05-01 11:12:53.799787875 +0200
+++ /var/tmp/diff_new_pack.Kh1yjM/_new 2020-05-01 11:12:53.799787875 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-python-cjson
#
-# 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,13 +17,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-python-cjson
Version:1.2.1
Release:0
Summary:C-accelerated JSON encoder/decoder for Python
License:LGPL-2.0-or-later
Group: Development/Languages/Python
-Url:https://github.com/AGProjects/python-cjson
+URL:https://github.com/AGProjects/python-cjson
Source:
https://files.pythonhosted.org/packages/source/p/python-cjson/python-cjson-%{version}.tar.gz
# https://github.com/AGProjects/python-cjson/issues/6
Patch0: py3.patch
@@ -46,8 +47,10 @@
%prep
%setup -q -n python-cjson-%{version}
+%if %{with python2}
cp cjson.c cjson%{python2_bin_suffix}.c
cp jsontest.py jsontest%{python2_bin_suffix}.py
+%endif
%patch0 -p1
cp cjson.c cjson%{python3_bin_suffix}.c
@@ -59,9 +62,11 @@
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if %{with python2}
rm cjson.c
ln -s cjson%{python2_bin_suffix}.c cjson.c
%python2_build
+%endif
rm cjson.c
ln -s cjson%{python3_bin_suffix}.c cjson.c
%python3_build
commit python-python-cjson for openSUSE:Factory
Hello community,
here is the log from the commit of package python-python-cjson for
openSUSE:Factory checked in at 2019-06-19 21:02:57
Comparing /work/SRC/openSUSE:Factory/python-python-cjson (Old)
and /work/SRC/openSUSE:Factory/.python-python-cjson.new.4811 (New)
Package is "python-python-cjson"
Wed Jun 19 21:02:57 2019 rev:2 rq:707300 version:1.2.1
Changes:
--- /work/SRC/openSUSE:Factory/python-python-cjson/python-python-cjson.changes
2019-05-16 22:07:14.846437788 +0200
+++
/work/SRC/openSUSE:Factory/.python-python-cjson.new.4811/python-python-cjson.changes
2019-06-19 21:03:07.938226926 +0200
@@ -1,0 +2,5 @@
+Mon Jun 3 17:56:51 UTC 2019 - Jan Engelhardt
+
+- Trim encyclopedic JSON report from description.
+
+---
Other differences:
--
++ python-python-cjson.spec ++
--- /var/tmp/diff_new_pack.zuLPyj/_old 2019-06-19 21:03:08.526227436 +0200
+++ /var/tmp/diff_new_pack.zuLPyj/_new 2019-06-19 21:03:08.530227440 +0200
@@ -12,38 +12,34 @@
# 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/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-python-cjson
Version:1.2.1
Release:0
+Summary:C-accelerated JSON encoder/decoder for Python
License:LGPL-2.0-or-later
-Summary:Fast JSON encoder/decoder for Python
-Url:https://github.com/AGProjects/python-cjson
Group: Development/Languages/Python
+Url:https://github.com/AGProjects/python-cjson
Source:
https://files.pythonhosted.org/packages/source/p/python-cjson/python-cjson-%{version}.tar.gz
# https://github.com/AGProjects/python-cjson/issues/6
Patch0: py3.patch
-BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
+BuildRequires: python-rpm-macros
%python_subpackages
%description
-Fast JSON encoder/decoder for Python.
-
-JSON stands for JavaScript Object Notation and is a text based lightweight data
-exchange format which is easy for humans to read/write and for machines to
-parse/generate. JSON is completely language independent and has multiple
-implementations in most of the programming languages, making it ideal for data
-exchange and storage.
+JSON (JavaScript Object Notation) is a text-based data exchange
+format.
The module is written in C and it is up to 250 times faster when compared to
-the other python JSON implementations which are written directly in python.
+the other Python JSON implementations which are written directly in Python.
This speed gain varies with the complexity of the data and the operation and is
the the range of 10-200 times for encoding operations and in the range of
100-250 times for decoding operations.
