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

[Sophie Brun]

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

sbrun-guest pushed a commit to branch master
in repository jsonpickle.

commit 341bad8687cabaf3342d0781a2ae9fde82079a6a
Merge: 63f2dba 6151b85
Author: Sophie Brun <sophie at freexian.com>
Date:   Mon Aug 21 11:24:57 2017 +0200

    merge patched into master

 PKG-INFO                                           |   4 +-
 README.rst                                         |   9 +
 debian/.git-dpm                                    |   6 +-
 .../disable-unsupported-sphinx-extension.patch     |   2 +-
 docs/source/changelog.rst                          |  15 ++
 docs/source/contrib.rst                            |  36 ++-
 docs/source/extensions.rst                         |  12 +
 docs/source/index.rst                              |   9 +-
 jsonpickle.egg-info/PKG-INFO                       |   4 +-
 jsonpickle.egg-info/SOURCES.txt                    |   3 +-
 jsonpickle/__init__.py                             |  33 ++-
 jsonpickle/backend.py                              |   5 +-
 jsonpickle/compat.py                               |   8 +-
 jsonpickle/ext/numpy.py                            | 246 +++++++++++++++++++--
 jsonpickle/handlers.py                             |  88 ++------
 jsonpickle/pickler.py                              | 128 +++++------
 jsonpickle/tags.py                                 |   5 +-
 jsonpickle/unpickler.py                            | 101 ++++++---
 jsonpickle/util.py                                 |  97 +++++---
 jsonpickle/version.py                              |   2 +-
 requirements-2.txt                                 |   6 +-
 requirements-3.txt                                 |   1 +
 requirements-test.txt                              |   5 +-
 requirements.txt                                   |   5 -
 setup.cfg                                          |   1 -
 setup.py                                           |   4 +-
 tests/jsonpickle_test.py                           |   2 +-
 tests/numpy_test.py                                | 212 +++++++++++++++++-
 tests/object_test.py                               |  60 +++--
 tests/sqlalchemy_test.py                           | 102 +++++++++
 tests/stdlib_test.py                               |  22 +-
 31 files changed, 935 insertions(+), 298 deletions(-)

diff --cc debian/.git-dpm
index 5e7fae3,0000000..41c7728
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
- 954e96343fec266a3d9e686835a9b6b439109bae
- 954e96343fec266a3d9e686835a9b6b439109bae
- e937fb67527297c47b28988d26a27bae533355f7
++6151b858384f82248920ec8df0982a8ae1132f23
++6151b858384f82248920ec8df0982a8ae1132f23
++659aaa267c2e16abb6d26cffeab07578fba72a0f
 +659aaa267c2e16abb6d26cffeab07578fba72a0f
 +jsonpickle_0.9.5.orig.tar.gz
 +0af23f64d24d8e163fc3610e3778956cc36c4b47
 +65748
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/disable-unsupported-sphinx-extension.patch
index d9fc354,0000000..eef0233
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 954e96343fec266a3d9e686835a9b6b439109bae Mon Sep 17 00:00:00 2001
++From 6151b858384f82248920ec8df0982a8ae1132f23 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