[Python-modules-commits] [jsonpickle] 04/06: merge patched into master

[Raphaël Hertzog]

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

hertzog pushed a commit to branch master
in repository jsonpickle.

commit 8acbdf9981bb8015e68eba8e5a0ca23c56d23f27
Merge: 37ea135 954e963
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Mar 9 10:12:54 2016 +0100

    merge patched into master

 COPYING                                            |  2 +-
 PKG-INFO                                           |  2 +-
 README.rst                                         | 19 +++++-
 Rakefile                                           | 74 ----------------------
 debian/.git-dpm                                    |  6 +-
 .../disable-unsupported-sphinx-extension.patch     |  2 +-
 docs/source/api.rst                                |  2 +
 docs/source/changelog.rst                          | 15 +++++
 docs/source/index.rst                              |  2 +-
 jsonpickle.egg-info/PKG-INFO                       |  2 +-
 jsonpickle.egg-info/SOURCES.txt                    |  2 +-
 jsonpickle/__init__.py                             |  8 ++-
 jsonpickle/backend.py                              | 35 ++++++++--
 jsonpickle/compat.py                               |  2 +
 jsonpickle/ext/numpy.py                            | 21 +++++-
 jsonpickle/handlers.py                             | 14 ++++
 jsonpickle/pickler.py                              | 17 +++--
 jsonpickle/unpickler.py                            | 15 ++++-
 jsonpickle/version.py                              |  2 +-
 requirements-3.txt                                 |  2 +
 setup.py                                           |  2 +-
 tests/backend_test.py                              | 26 ++++----
 tests/helper.py                                    |  1 +
 tests/numpy_test.py                                |  2 +
 tests/object_test.py                               | 11 ++++
 tests/runtests.py                                  |  2 +
 tests/stdlib_test.py                               | 39 ++++++++++++
 27 files changed, 210 insertions(+), 117 deletions(-)

diff --cc debian/.git-dpm
index 02a4418,0000000..d42069a
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
- 34f2228c14d77ecf66d66bbcca7a49bbc1707727
- 34f2228c14d77ecf66d66bbcca7a49bbc1707727
- 74d4ff67fbf31dd5f6344f17044b09161fc3ba2b
++954e96343fec266a3d9e686835a9b6b439109bae
++954e96343fec266a3d9e686835a9b6b439109bae
++e937fb67527297c47b28988d26a27bae533355f7
 +e937fb67527297c47b28988d26a27bae533355f7
 +jsonpickle_0.9.3.orig.tar.gz
 +86b76d8047170a279f3c7a7e1513a84e09c52486
 +60489
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/disable-unsupported-sphinx-extension.patch
index 1895f49,0000000..d9fc354
mode 100644,000000..100644
--- a/debian/patches/disable-unsupported-sphinx-extension.patch
+++ b/debian/patches/disable-unsupported-sphinx-extension.patch
@@@ -1,49 -1,0 +1,49 @@@
- From 34f2228c14d77ecf66d66bbcca7a49bbc1707727 Mon Sep 17 00:00:00 2001
++From 954e96343fec266a3d9e686835a9b6b439109bae Mon Sep 17 00:00:00 2001
 +From: Jan Dittberner <jandd at debian.org>
 +Date: Thu, 8 Oct 2015 09:25:42 -0700
 +Subject: disable Sphinx extensions not available in Debian or requiring remote
 + access
 +
 +Patch-Name: disable-unsupported-sphinx-extension.patch
 +---
 + docs/source/conf.py | 19 +------------------
 + 1 file changed, 1 insertion(+), 18 deletions(-)
 +
 +diff --git a/docs/source/conf.py b/docs/source/conf.py
 +index 8be2120..ea9c64b 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -19,24 +19,11 @@ import sys, os
 + sys.path.insert(0, os.path.abspath(os.path.join('..', '..')))
 + import jsonpickle
 + 
 +-sys.path.insert(1, os.path.abspath(os.path.join('..', '..', 'thirdparty', 'sphinx-to-github')))
 +-try:
 +-    import sphinxtogithub
 +-    sphinxtogithub # import side-effects
 +-except ImportError, e:
 +-    raise ImportError('Could not import sphinxtogithub\n'
 +-                      'Is the git submodule populated at thirdparty/sphinx-to-github?\n'
 +-                      'At the project root run:\n'
 +-                      '\tgit submodule init\n'
 +-                      '\tgit submodule update')
 +-
 + # -- General configuration -----------------------------------------------------
 + 
 + # Add any Sphinx extension module names here, as strings. They can be extensions
 + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinxtogithub']
 +-
 +-sphinx_to_github = True
 ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.coverage']
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']
 +@@ -206,7 +193,3 @@ latex_documents = [
 + 
 + # If false, no module index is generated.
 + #latex_use_modindex = True
 +-
 +-
 +-# Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'http://docs.python.org/': None}

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