[Python-modules-commits] [elasticsearch-curator] 13/14: 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 d6441d8cfbbbe0aaec43d6f992175ec652a39fe0
Merge: 817063f dfa1c8c
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Jul 5 18:15:47 2016 +0200

    merge patched into master

 .travis.yml                                        |   2 +-
 CONTRIBUTING.md                                    |   4 +-
 curator/_version.py                                |   2 +-
 curator/actions.py                                 |   6 +-
 curator/indexlist.py                               |  15 +-
 curator/logtools.py                                |   2 +
 curator/repomgrcli.py                              |   1 +
 curator/snapshotlist.py                            |   1 +
 curator/utils.py                                   |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../0002-Restore-es_repo_mgr-endpoint.patch        | 436 ---------------------
 debian/patches/series                              |   1 -
 debian/patches/setup.py-read-README-utf-8          |   4 +-
 docs/Changelog.rst                                 |  16 +
 docs/asciidoc/actions.asciidoc                     |   2 +-
 docs/asciidoc/index.asciidoc                       |   2 +-
 test/unit/test_class_index_list.py                 |   8 +-
 test/unit/testvars.py                              |  34 ++
 18 files changed, 90 insertions(+), 454 deletions(-)

diff --cc debian/.git-dpm
index 79e387b,0000000..5ae44c0
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
- b913036b27edebc272e6b3712c2ec6366d37a9f9
- b913036b27edebc272e6b3712c2ec6366d37a9f9
- ab0a73cc20ea7786a509a8e69d14f18913d24913
++dfa1c8cc1aedbc83b7620fdef6fd7fb680fe4f91
++dfa1c8cc1aedbc83b7620fdef6fd7fb680fe4f91
++85f6a59b76ddb85142061690b1e2de87c4fc4cfc
 +85f6a59b76ddb85142061690b1e2de87c4fc4cfc
 +elasticsearch-curator_4.0.1.orig.tar.gz
 +85db7214c7197e21e827c38fd7d0f717cacee7e3
 +107792
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 7297585,0000000..e2d8982
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +setup.py-read-README-utf-8
- 0002-Restore-es_repo_mgr-endpoint.patch
diff --cc debian/patches/setup.py-read-README-utf-8
index 392f035,0000000..2c37db2
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 a5fa71c124cb8786bb3b65b5ed57075305bba447 Mon Sep 17 00:00:00 2001
++From dfa1c8cc1aedbc83b7620fdef6fd7fb680fe4f91 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 66cff48..f478cb7 100644
++index d8534c1..dcbc3d2 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