[Python-modules-commits] [elasticsearch-curator] 05/06: merge patched into master

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository elasticsearch-curator.

commit 64b8188e1d18000d7e3a7cdafaa05197cfe21b13
Merge: d39d5a1 ff4fa39
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Jan 2 14:57:36 2017 +0200

    merge patched into master

 .travis.yml                                        |  3 +-
 curator/_version.py                                |  2 +-
 curator/singletons.py                              | 47 +++++++++-------------
 debian/.git-dpm                                    |  6 +--
 ...local-inventory-references-for-intersphin.patch |  2 +-
 debian/patches/setup.py-read-README-utf-8          |  2 +-
 docs/Changelog.rst                                 | 24 +++++++++++
 docs/asciidoc/actions.asciidoc                     | 30 +++++++-------
 docs/asciidoc/configuration.asciidoc               |  2 +-
 docs/asciidoc/examples.asciidoc                    | 24 +++++------
 docs/asciidoc/faq.asciidoc                         |  2 +-
 docs/asciidoc/filter_elements.asciidoc             |  2 +
 docs/asciidoc/filters.asciidoc                     | 30 ++++++++------
 docs/asciidoc/inc_filter_chaining.asciidoc         | 23 +++++++++++
 docs/asciidoc/index.asciidoc                       |  2 +-
 docs/asciidoc/installation.asciidoc                |  2 +-
 test/integration/test_cli.py                       | 14 ++++++-
 17 files changed, 137 insertions(+), 80 deletions(-)

diff --cc debian/.git-dpm
index 7475c61,0000000..4238530
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
- acc0aa55d20342d00b836491a650915dabb741c4
- acc0aa55d20342d00b836491a650915dabb741c4
- 1ea533b9c772000e427d8b03a2b425489821d25a
++ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed
++ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed
++0853854035a54106dd650b5d39fbd1691e4712a6
 +0853854035a54106dd650b5d39fbd1691e4712a6
 +elasticsearch-curator_4.2.5.orig.tar.gz
 +05cc71b83f98033bebb4b1ecd792e97408da6b95
 +227607
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-sphinx-use-local-inventory-references-for-intersphin.patch
index f86303f,0000000..17ed4a9
mode 100644,000000..100644
--- a/debian/patches/0002-sphinx-use-local-inventory-references-for-intersphin.patch
+++ b/debian/patches/0002-sphinx-use-local-inventory-references-for-intersphin.patch
@@@ -1,30 -1,0 +1,30 @@@
- From acc0aa55d20342d00b836491a650915dabb741c4 Mon Sep 17 00:00:00 2001
++From ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed Mon Sep 17 00:00:00 2001
 +From: Apollon Oikonomopoulos <apoikos at debian.org>
 +Date: Fri, 22 Jul 2016 23:48:07 +0300
 +Subject: sphinx: use local inventory references for intersphinx
 +
 +Note that we will not be making this conditional: we want the build to
 +fail if intersphinx was to fetch inventory data from the internet.
 +
 +Closes: #830550
 +---
 + docs/conf.py | 6 ++++--
 + 1 file changed, 4 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 6ff9369..95ffc43 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -47,8 +47,10 @@ sys.path.insert(0, os.path.abspath('../'))
 + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx']
 + 
 + intersphinx_mapping = {
 +-	'python': ('https://docs.python.org/3.5', None),
 +-	'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0', None),
 ++	'python': ('https://docs.python.org/3.5',
 ++               '/usr/share/doc/python3-doc/html/objects.inv'),
 ++	'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0',
 ++               '/usr/share/doc/python-elasticsearch-doc/html/objects.inv'),
 + }
 + 
 + autoclass_content = "both"
diff --cc debian/patches/setup.py-read-README-utf-8
index 19b9230,0000000..a8838e6
mode 100644,000000..100644
--- a/debian/patches/setup.py-read-README-utf-8
+++ b/debian/patches/setup.py-read-README-utf-8
@@@ -1,33 -1,0 +1,33 @@@
- From 644ce9423f45c94087058c331d1ee619bdd40afa Mon Sep 17 00:00:00 2001
++From 6982261c033a4667ce83f0d7b4a405e7f2e44e7d Mon Sep 17 00:00:00 2001
 +From: Apollon Oikonomopoulos <apoikos at debian.org>
 +Date: Thu, 8 Oct 2015 09:00:30 -0700
 +Subject: Properly read unicode data from README.md for Python 3
 +
 + README.md contains non-ASCII characters and Python 3 errors out since it was
 + not instructed to read unicode data from the file. Fix this by opening the
 + file with a utf-8 encoding for Python 3.
 +
 +Forwarded: no
 +Last-Update: 2015-02-02
 +Patch-Name: setup.py-read-README-utf-8
 +---
 + setup.py | 6 +++++-
 + 1 file changed, 5 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 01ae5f1..e6f755f 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -5,7 +5,11 @@ from setuptools import setup
 + 
 + # Utility function to read from file.
 + def fread(fname):
 +-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
 ++    try:
 ++        text = open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read()
 ++    except TypeError:
 ++        text = open(os.path.join(os.path.dirname(__file__), fname)).read()
 ++    return text
 + 
 + def get_version():
 +     VERSIONFILE="curator/_version.py"

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