From 911f0aba4c5d2d576d44d7d642fee1f987f64ece Mon Sep 17 00:00:00 2001 From: Arjan Van De Ven Date: Sun, 18 Jun 2017 14:38:49 +0000 Subject: [PATCH] simplejson: Autospec creation for update from version 3.10.0 to version 3.11.0 Version 3.11.0 released 2017-06-18 * docstring fix in JSONEncoder https://github.com/simplejson/simplejson/pull/172 * Call PyObject_IsTrue() only once for the strict argument of scanner https://github.com/simplejson/simplejson/pull/170 * Fix a crash with unencodable encoding in the encoder https://github.com/simplejson/simplejson/pull/171 * Remove unused imports https://github.com/simplejson/simplejson/pull/162 * Remove remnants of Python 2.4 support https://github.com/simplejson/simplejson/pull/168 * Fix argument checking errors in _speedups.c https://github.com/simplejson/simplejson/pull/169 * Remove the `__init__` methods in extension classes (NEWS truncated at 15 lines) --- ChangeLog | 22 ++++++++++++++++++++++ Makefile | 2 +- options.conf | 8 +++++++- release | 2 +- simplejson.spec | 23 +++++++++++++++-------- testresults | 4 ++-- upstream | 2 +- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd01fe8..ae8b7e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +Version 3.11.0 released 2017-06-18 + +* docstring fix in JSONEncoder + https://github.com/simplejson/simplejson/pull/172 +* Call PyObject_IsTrue() only once for the strict argument of scanner + https://github.com/simplejson/simplejson/pull/170 +* Fix a crash with unencodable encoding in the encoder + https://github.com/simplejson/simplejson/pull/171 +* Remove unused imports + https://github.com/simplejson/simplejson/pull/162 +* Remove remnants of Python 2.4 support + https://github.com/simplejson/simplejson/pull/168 +* Fix argument checking errors in _speedups.c + https://github.com/simplejson/simplejson/pull/169 +* Remove the `__init__` methods in extension classes + https://github.com/simplejson/simplejson/pull/166 +* Fix typo in the doc for loads + https://github.com/simplejson/simplejson/issues/161 +* Add Python 3.6 to testing matrix and PyPI metadata + https://github.com/simplejson/simplejson/pull/153 + https://github.com/simplejson/simplejson/pull/152 + Version 3.10.0 released 2016-10-28 * Add RawJSON class to allow a faster path for already encoded JSON. diff --git a/Makefile b/Makefile index 29db5c9..bb7f1a6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := simplejson -URL := https://github.com/simplejson/simplejson/archive/v3.10.0.tar.gz +URL := https://github.com/simplejson/simplejson/archive/v3.11.0.tar.gz include ../common/Makefile.common diff --git a/options.conf b/options.conf index 31cacb2..4cc14c9 100644 --- a/options.conf +++ b/options.conf @@ -19,14 +19,20 @@ funroll-loops = false insecure_build = false # do not remove static libraries keepstatic = false -# do not require autostart suepackage +# do not require autostart subpackage no_autostart = false +# disable stripping binaries +nostrip = false # optimize build for size over speed optimize_size = false # set profile for pgo pgo = false +# set flags for security-sensitive builds +security_sensitive = false # do not run test suite skip_tests = false +# add .so files to the lib package instead of dev +so_to_lib = false # configure build for avx2 use_avx2 = false # add clang flags diff --git a/release b/release index f5c8955..bb95160 100644 --- a/release +++ b/release @@ -1 +1 @@ -32 +33 diff --git a/simplejson.spec b/simplejson.spec index 102de07..d28da0a 100644 --- a/simplejson.spec +++ b/simplejson.spec @@ -3,10 +3,10 @@ # Generated by: autospec.py # Name : simplejson -Version : 3.10.0 -Release : 32 -URL : https://github.com/simplejson/simplejson/archive/v3.10.0.tar.gz -Source0 : https://github.com/simplejson/simplejson/archive/v3.10.0.tar.gz +Version : 3.11.0 +Release : 33 +URL : https://github.com/simplejson/simplejson/archive/v3.11.0.tar.gz +Source0 : https://github.com/simplejson/simplejson/archive/v3.11.0.tar.gz Summary : No detailed summary available Group : Development/Tools License : AFL-2.1 @@ -34,11 +34,14 @@ python components for the simplejson package. %prep -%setup -q -n simplejson-3.10.0 +%setup -q -n simplejson-3.11.0 %build +export http_proxy=http://127.0.0.1:9/ +export https_proxy=http://127.0.0.1:9/ +export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C -export SOURCE_DATE_EPOCH=1484575422 +export SOURCE_DATE_EPOCH=1497796729 python2 setup.py build -b py2 python3 setup.py build -b py3 @@ -48,14 +51,18 @@ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 PYTHONPATH=%{buildroot}/usr/lib/python2.7/site-packages python setup.py test %install -export SOURCE_DATE_EPOCH=1484575422 +export SOURCE_DATE_EPOCH=1497796729 rm -rf %{buildroot} python2 -tt setup.py build -b py2 install --root=%{buildroot} --force python3 -tt setup.py build -b py3 install --root=%{buildroot} --force +echo ----[ mark ]---- +cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : +echo ----[ mark ]---- %files %defattr(-,root,root,-) %files python %defattr(-,root,root,-) -/usr/lib/python*/* +/usr/lib/python2*/* +/usr/lib/python3*/* diff --git a/testresults b/testresults index 12b983b..194f49a 100644 --- a/testresults +++ b/testresults @@ -1,5 +1,5 @@ -Total : 128 +Total : 131 Pass : 125 Fail : 0 -Skip : 3 +Skip : 6 XFail : 0 diff --git a/upstream b/upstream index 3d7f0f1..af6580c 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -293ee80ecadf758c373584599cad7ae5a33a1aad/v3.10.0.tar.gz +5eb94bfadffaa172cd3798851ee484ee95a3db11/v3.11.0.tar.gz