[Python-modules-commits] [simplejson] 02/04: record new upstream branch created by importing simplejson_3.13.2.orig.tar.gz and merge it

[Piotr Ożarowski]

This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository simplejson.

commit b0fdea679704eb646a4b9532dd89872929ef9b01
Merge: a60e07d 26d9b03
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Nov 30 13:45:23 2017 +0100

    record new upstream branch created by importing simplejson_3.13.2.orig.tar.gz and merge it

 CHANGES.txt                       | 28 +++++++++++++++++++
 PKG-INFO                          | 20 ++------------
 conf.py                           |  4 +--
 debian/.git-dpm                   | 14 +++++-----
 scripts/artifacts.py              | 57 ++++++++++++++++++++++++++++-----------
 setup.cfg                         |  1 -
 setup.py                          |  5 +++-
 simplejson.egg-info/PKG-INFO      |  3 ++-
 simplejson/__init__.py            |  5 ++--
 simplejson/_speedups.c            | 41 +++++++++++++++++++++-------
 simplejson/encoder.py             | 20 +++++++++-----
 simplejson/tests/test_dump.py     | 14 +++++++++-
 simplejson/tests/test_errors.py   | 19 ++++++++++++-
 simplejson/tests/test_speedups.py | 24 +++++++++++++++++
 simplejson/tests/test_tool.py     | 34 ++++++++++++++---------
 15 files changed, 212 insertions(+), 77 deletions(-)

diff --cc debian/.git-dpm
index 5926d44,0000000..da5c03a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
- 9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
- 9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
- 9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
- simplejson_3.12.0.orig.tar.gz
- 0de9e43973a315c98b7308c65416d4bae6074cc4
- 77969
++26d9b037c2eb05aae73b116df8bfb1938167f071
++26d9b037c2eb05aae73b116df8bfb1938167f071
++26d9b037c2eb05aae73b116df8bfb1938167f071
++26d9b037c2eb05aae73b116df8bfb1938167f071
++simplejson_3.13.2.orig.tar.gz
++f8a479361560fc5c50ce494058ba4dfedb4810b9
++79735
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/simplejson.git