[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 tag debian/3.4.0-1
in repository elasticsearch-curator.

commit 2b5519bf5cbc2dc62210f7b718e20e3c2a7b5c7b
Merge: c6f6d06 7f243d8
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Nov 4 14:29:04 2015 +0200

    merge patched into master

 CONTRIBUTORS                               |   2 +
 Changelog.rst                              |  17 +
 NOTICE                                     |  96 ++++
 curator/_version.py                        |   2 +-
 curator/api/alias.py                       |   6 +-
 curator/api/delete.py                      |   6 +
 curator/api/filter.py                      |  14 +-
 curator/api/utils.py                       |  48 +-
 curator/cli/alias.py                       |   5 +-
 curator/cli/allocation.py                  |   8 +-
 curator/cli/cli.py                         |  10 +-
 curator/cli/es_repo_mgr.py                 |   6 +-
 curator/cli/index_selection.py             |  39 +-
 curator/cli/replicas.py                    |   5 +-
 curator/cli/snapshot.py                    |   5 +-
 curator/cli/snapshot_selection.py          |  10 +-
 curator/cli/utils.py                       |  22 +-
 debian/.git-dpm                            |   6 +-
 debian/patches/setup.py-read-README-utf-8  |   4 +-
 docs/Changelog.rst                         | 683 ++++++++++++++++++++++++++++-
 docs/asciidoc/commands/allocation.asciidoc |   4 +-
 docs/asciidoc/commands/optimize.asciidoc   |   2 +-
 docs/asciidoc/flags/index.asciidoc         |   2 +
 docs/asciidoc/flags/quiet.asciidoc         |  32 ++
 docs/asciidoc/index.asciidoc               |   4 +-
 docs/asciidoc/misc/installation.asciidoc   |  20 +-
 requirements.txt                           |   2 +-
 setup.py                                   |   2 +-
 test/integration/__init__.py               |   3 +
 test/integration/test_api_utils.py         |  24 +
 test/integration/test_cli_commands.py      |  18 +
 test/unit/test_api_commands.py             |  38 +-
 test/unit/test_api_filter.py               |  24 +-
 test/unit/test_api_utils.py                |  30 ++
 test/unit/test_cli_utils.py                |   2 +-
 35 files changed, 1101 insertions(+), 100 deletions(-)

diff --cc debian/.git-dpm
index 9de0c8c,0000000..18baa38
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
- 679a1e63a5debd21311809aa8e0f7ea5fba4d67e
- 679a1e63a5debd21311809aa8e0f7ea5fba4d67e
- e703ed91c99b143acba406c96a67aefd4ef81869
++7f243d80ca1664bb689bc859d7a97416a74906e9
++7f243d80ca1664bb689bc859d7a97416a74906e9
++76aeef48e56ce1899936c1d2a303ef058c7ba98e
 +76aeef48e56ce1899936c1d2a303ef058c7ba98e
 +elasticsearch-curator_3.4.0.orig.tar.gz
 +4f1823a74b628e4061585c218981ccb3a7b792b9
 +96741
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/setup.py-read-README-utf-8
index c19752b,0000000..d6b2996
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 679a1e63a5debd21311809aa8e0f7ea5fba4d67e Mon Sep 17 00:00:00 2001
++From 7f243d80ca1664bb689bc859d7a97416a74906e9 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 a089784..a77b61e 100644
++index 9d36504..5d299f0 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