[Python-modules-commits] [elasticsearch-curator] 06/07: 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.3.0-1
in repository elasticsearch-curator.

commit a51f9bf21c43363601f43bc5ed85c5b4b62abc18
Merge: 85140a0 679a1e6
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Oct 23 15:57:47 2015 +0300

    merge patched into master

 CONTRIBUTORS                                 |  1 +
 Changelog.rst                                | 41 ++++++++++++++++
 curator/_version.py                          |  2 +-
 curator/api/allocation.py                    | 19 +++++---
 curator/api/filter.py                        | 21 +++++---
 curator/api/utils.py                         |  7 +--
 curator/cli/allocation.py                    |  9 +++-
 curator/cli/cli.py                           | 12 ++++-
 curator/cli/snapshot_selection.py            |  6 +--
 curator/cli/utils.py                         | 24 ++++++---
 debian/.git-dpm                              |  6 +--
 debian/patches/setup.py-read-README-utf-8    |  4 +-
 docs/asciidoc/commands/allocation.asciidoc   | 16 +++---
 docs/asciidoc/commands/optimize.asciidoc     |  2 +-
 docs/asciidoc/flags/certificate.asciidoc     | 28 +++++++++++
 docs/asciidoc/flags/index.asciidoc           |  4 ++
 docs/asciidoc/flags/newer-than.asciidoc      |  5 +-
 docs/asciidoc/flags/older-than.asciidoc      |  3 ++
 docs/asciidoc/flags/ssl-no-validate.asciidoc | 34 +++++++++++++
 docs/asciidoc/flags/use_ssl.asciidoc         | 38 +++++++++++++--
 docs/asciidoc/index.asciidoc                 |  2 +-
 setup.py                                     |  2 +-
 test/integration/test_api_commands.py        | 15 ++++++
 test/integration/test_cli_commands.py        | 73 +++++++++++++++++++++++++++-
 test/integration/test_cli_utils.py           | 42 +++++++++++++++-
 test/unit/test_api_commands.py               | 14 ++++++
 test/unit/test_api_filter.py                 | 22 +++++++++
 test/unit/test_cli_utils.py                  |  9 ++++
 28 files changed, 410 insertions(+), 51 deletions(-)

diff --cc debian/.git-dpm
index 7875979,0000000..547c310
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
- ce5f356fd2a66e4937809e8839b9c43d7d4106ef
- ce5f356fd2a66e4937809e8839b9c43d7d4106ef
- e9c948f5961a7e38aa1ac283c327b5b93957113b
++679a1e63a5debd21311809aa8e0f7ea5fba4d67e
++679a1e63a5debd21311809aa8e0f7ea5fba4d67e
++e703ed91c99b143acba406c96a67aefd4ef81869
 +e703ed91c99b143acba406c96a67aefd4ef81869
 +elasticsearch-curator_3.3.0.orig.tar.gz
 +b48242961354a13b08aa11ec8008cde4d15d02fe
 +85260
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/setup.py-read-README-utf-8
index a323acd,0000000..c19752b
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 ce5f356fd2a66e4937809e8839b9c43d7d4106ef Mon Sep 17 00:00:00 2001
++From 679a1e63a5debd21311809aa8e0f7ea5fba4d67e 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 fd43444..629b2bc 100644
++index a089784..a77b61e 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