[Python-modules-commits] [elasticsearch-curator] 05/14: merge patched into master
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Tue Jul 5 16:22:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository elasticsearch-curator.
commit 82a60227bf66075329a4377398fb96aca615529f
Merge: 81540f8 a5fa71c
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Wed Jun 29 21:01:54 2016 +0200
merge patched into master
.travis.yml | 31 +-
CONTRIBUTING.md | 34 +-
NOTICE | 10 +
README.rst | 62 +-
binary_release.py | 16 +-
curator/__init__.py | 9 +-
curator/_version.py | 2 +-
curator/actions.py | 960 ++++++++++++++++++
curator/api/__init__.py | 13 -
curator/api/alias.py | 95 --
curator/api/allocation.py | 58 --
curator/api/bloom.py | 65 --
curator/api/close.py | 38 -
curator/api/delete.py | 59 --
curator/api/filter.py | 370 -------
curator/api/opener.py | 31 -
curator/api/optimize.py | 56 --
curator/api/replicas.py | 44 -
curator/api/seal.py | 66 --
curator/api/show.py | 17 -
curator/api/snapshot.py | 127 ---
curator/api/utils.py | 529 ----------
curator/cli.py | 251 +++++
curator/cli/__init__.py | 16 -
curator/cli/alias.py | 19 -
curator/cli/allocation.py | 27 -
curator/cli/bloom.py | 13 -
curator/cli/cli.py | 120 ---
curator/cli/close.py | 11 -
curator/cli/delete.py | 18 -
curator/cli/es_repo_mgr.py | 188 ----
curator/cli/index_selection.py | 178 ----
curator/cli/opener.py | 11 -
curator/cli/optimize.py | 19 -
curator/cli/replicas.py | 18 -
curator/cli/seal.py | 14 -
curator/cli/show.py | 13 -
curator/cli/snapshot.py | 55 -
curator/cli/snapshot_selection.py | 102 --
curator/cli/utils.py | 286 ------
curator/curator.py | 2 +-
curator/es_repo_mgr.py | 5 -
curator/exceptions.py | 40 +
curator/indexlist.py | 726 ++++++++++++++
curator/logtools.py | 69 ++
curator/settings.py | 148 +++
curator/snapshotlist.py | 337 +++++++
curator/utils.py | 1024 +++++++++++++++++++
debian/.git-dpm | 6 +-
debian/patches/setup.py-read-README-utf-8 | 4 +-
docs/Changelog.rst | 273 ++++-
docs/actionclasses.rst | 69 ++
docs/asciidoc/{misc => }/about.asciidoc | 53 +-
docs/asciidoc/actions.asciidoc | 645 ++++++++++++
docs/asciidoc/command-line.asciidoc | 65 ++
docs/asciidoc/commands/alias.asciidoc | 58 --
docs/asciidoc/commands/allocation.asciidoc | 133 ---
docs/asciidoc/commands/bloom.asciidoc | 64 --
docs/asciidoc/commands/close.asciidoc | 57 --
docs/asciidoc/commands/delete.asciidoc | 99 --
docs/asciidoc/commands/index.asciidoc | 30 -
docs/asciidoc/commands/open.asciidoc | 52 -
docs/asciidoc/commands/optimize.asciidoc | 90 --
docs/asciidoc/commands/replicas.asciidoc | 47 -
docs/asciidoc/commands/seal.asciidoc | 107 --
docs/asciidoc/commands/show.asciidoc | 55 -
docs/asciidoc/commands/snapshot.asciidoc | 87 --
docs/asciidoc/configuration.asciidoc | 471 +++++++++
docs/asciidoc/examples.asciidoc | 455 +++++++++
docs/asciidoc/{misc => }/faq.asciidoc | 88 +-
docs/asciidoc/filter_elements.asciidoc | 305 ++++++
docs/asciidoc/filters.asciidoc | 414 ++++++++
docs/asciidoc/flags/all-indices.asciidoc | 35 -
docs/asciidoc/flags/all-snapshots.asciidoc | 30 -
docs/asciidoc/flags/certificate.asciidoc | 28 -
docs/asciidoc/flags/client-cert.asciidoc | 35 -
docs/asciidoc/flags/client-key.asciidoc | 33 -
docs/asciidoc/flags/debug.asciidoc | 26 -
docs/asciidoc/flags/dry-run.asciidoc | 30 -
docs/asciidoc/flags/exclude.asciidoc | 51 -
docs/asciidoc/flags/help.asciidoc | 69 --
docs/asciidoc/flags/host.asciidoc | 29 -
docs/asciidoc/flags/http_auth.asciidoc | 27 -
docs/asciidoc/flags/index.asciidoc | 87 --
docs/asciidoc/flags/index_flag.asciidoc | 38 -
docs/asciidoc/flags/logfile.asciidoc | 26 -
docs/asciidoc/flags/logformat.asciidoc | 27 -
docs/asciidoc/flags/loglevel.asciidoc | 26 -
docs/asciidoc/flags/master-only.asciidoc | 29 -
docs/asciidoc/flags/newer-than.asciidoc | 36 -
docs/asciidoc/flags/older-than.asciidoc | 35 -
docs/asciidoc/flags/port.asciidoc | 27 -
docs/asciidoc/flags/prefix.asciidoc | 37 -
docs/asciidoc/flags/quiet.asciidoc | 32 -
docs/asciidoc/flags/regex.asciidoc | 27 -
docs/asciidoc/flags/repository.asciidoc | 26 -
docs/asciidoc/flags/skip-repo-validation.asciidoc | 37 -
docs/asciidoc/flags/snapshot_flag.asciidoc | 38 -
docs/asciidoc/flags/ssl-no-validate.asciidoc | 34 -
docs/asciidoc/flags/suffix.asciidoc | 36 -
docs/asciidoc/flags/time-unit.asciidoc | 35 -
docs/asciidoc/flags/timeout.asciidoc | 32 -
docs/asciidoc/flags/timestring.asciidoc | 41 -
docs/asciidoc/flags/url_prefix.asciidoc | 29 -
docs/asciidoc/flags/use_ssl.asciidoc | 61 --
docs/asciidoc/flags/version.asciidoc | 24 -
docs/asciidoc/{misc => }/getting_started.asciidoc | 4 +-
docs/asciidoc/index.asciidoc | 24 +-
docs/asciidoc/{misc => }/installation.asciidoc | 4 +-
docs/asciidoc/misc/command-line.asciidoc | 94 --
docs/asciidoc/misc/contributing.asciidoc | 30 -
docs/asciidoc/misc/examples.asciidoc | 82 --
docs/asciidoc/misc/exitcodes.asciidoc | 12 -
docs/asciidoc/misc/glossary.asciidoc | 34 -
docs/asciidoc/options.asciidoc | 380 +++++++
docs/asciidoc/selection/index.asciidoc | 112 ---
docs/asciidoc/subcommands/index.asciidoc | 145 ---
docs/asciidoc/{misc => }/upgrading.asciidoc | 0
docs/commands.rst | 149 ---
docs/conf.py | 9 +-
docs/examples.rst | 233 +----
docs/filters.rst | 63 +-
docs/index.rst | 28 +-
docs/objectclasses.rst | 20 +
docs/utilities.rst | 108 +-
examples/actions/alias.yml | 51 +
examples/actions/allocation.yml | 32 +
examples/actions/close.yml | 30 +
examples/actions/create_index.yml | 20 +
examples/actions/delete_indices.yml | 31 +
examples/actions/delete_snapshots.yml | 29 +
examples/actions/forcemerge.yml | 33 +
examples/actions/open.yml | 36 +
examples/actions/replicas.yml | 30 +
examples/actions/restore.yml | 41 +
examples/actions/snapshot.yml | 39 +
examples/curator.yml | 24 +
requirements.txt | 3 +-
run_es_repo_mgr.py | 8 -
setup.py | 44 +-
test/integration/__init__.py | 49 +-
test/integration/test_alias.py | 198 ++++
test/integration/test_allocation.py | 147 +++
test/integration/test_api_commands.py | 196 ----
test/integration/test_api_utils.py | 106 --
test/integration/test_cli.py | 192 ++++
test/integration/test_cli_commands.py | 1111 ---------------------
test/integration/test_cli_utils.py | 138 ---
test/integration/test_close.py | 149 +++
test/integration/test_create_index.py | 83 ++
test/integration/test_delete_indices.py | 118 +++
test/integration/test_delete_snapshots.py | 98 ++
test/integration/test_es_repo_mgr.py | 169 ----
test/integration/test_forcemerge.py | 62 ++
test/integration/test_open.py | 111 ++
test/integration/test_replicas.py | 70 ++
test/integration/test_restore.py | 117 +++
test/integration/test_snapshot.py | 69 ++
test/integration/testvars.py | 405 ++++++++
test/run_tests.py | 3 +-
test/unit/__init__.py | 35 +
test/unit/test_action_alias.py | 129 +++
test/unit/test_action_allocation.py | 92 ++
test/unit/test_action_close.py | 60 ++
test/unit/test_action_create_index.py | 34 +
test/unit/test_action_delete_indices.py | 72 ++
test/unit/test_action_delete_snapshots.py | 50 +
test/unit/test_action_forcemerge.py | 87 ++
test/unit/test_action_open.py | 51 +
test/unit/test_action_replicas.py | 68 ++
test/unit/test_action_restore.py | 152 +++
test/unit/test_action_snapshot.py | 164 +++
test/unit/test_api_commands.py | 700 -------------
test/unit/test_api_filter.py | 338 -------
test/unit/test_api_utils.py | 328 ------
test/unit/test_class_index_list.py | 871 ++++++++++++++++
test/unit/test_class_snapshot_list.py | 337 +++++++
test/unit/test_cli_methods.py | 66 ++
test/unit/test_cli_utils.py | 146 ---
test/unit/test_es_repo_mgr.py | 86 --
test/unit/test_utils.py | 565 +++++++++++
test/unit/testvars.py | 718 +++++++++++++
travis-run.sh | 35 +
183 files changed, 12840 insertions(+), 9259 deletions(-)
diff --cc debian/.git-dpm
index 0657a68,0000000..6012465
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
- 7f243d80ca1664bb689bc859d7a97416a74906e9
- 7f243d80ca1664bb689bc859d7a97416a74906e9
- 76aeef48e56ce1899936c1d2a303ef058c7ba98e
++a5fa71c124cb8786bb3b65b5ed57075305bba447
++a5fa71c124cb8786bb3b65b5ed57075305bba447
++ab0a73cc20ea7786a509a8e69d14f18913d24913
+ab0a73cc20ea7786a509a8e69d14f18913d24913
+elasticsearch-curator_4.0.0.orig.tar.gz
+a8a4ff74875dddf4784a97128038302ffb997c09
+104518
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/setup.py-read-README-utf-8
index d6b2996,0000000..392f035
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 7f243d80ca1664bb689bc859d7a97416a74906e9 Mon Sep 17 00:00:00 2001
++From a5fa71c124cb8786bb3b65b5ed57075305bba447 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 9d36504..5d299f0 100644
++index 66cff48..f478cb7 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
More information about the Python-modules-commits
mailing list