[Python-modules-commits] [elasticsearch-curator] 05/18: merge patched into master
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Tue Oct 17 08:17:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository elasticsearch-curator.
commit c9c6fd930e9a0df2a5e5a6038d30305f7704dbde
Merge: 4e681fe 7bf31d8
Author: Aggelos Avgerinos <avgerinos at skroutz.gr>
Date: Thu Aug 31 16:42:04 2017 +0300
merge patched into master
.travis.yml | 12 +-
Changelog.rst | 1560 ++++++++++++-
LICENSE.txt | 2 +-
README.rst | 57 +-
binary_release.py | 14 +-
curator/_version.py | 3 +-
curator/actions.py | 784 ++++++-
curator/cli.py | 24 +-
curator/config_utils.py | 1 -
.../config_file.py => defaults/client_defaults.py} | 10 +-
.../{validators => defaults}/filter_elements.py | 38 +-
curator/{validators => defaults}/filtertypes.py | 15 +-
curator/defaults/option_defaults.py | 271 +++
curator/defaults/settings.py | 39 +-
curator/exceptions.py | 5 +
curator/indexlist.py | 108 +-
curator/singletons.py | 9 +-
curator/snapshotlist.py | 56 +-
curator/utils.py | 647 +++++-
curator/validators/actions.py | 6 +-
curator/validators/config_file.py | 46 +-
curator/validators/filters.py | 27 +-
curator/validators/options.py | 262 +--
debian/.git-dpm | 6 +-
...local-inventory-references-for-intersphin.patch | 12 +-
debian/patches/setup.py-read-README-utf-8 | 4 +-
docs/Changelog.rst | 249 +++
docs/actionclasses.rst | 10 +
docs/asciidoc/about.asciidoc | 19 +-
docs/asciidoc/actions.asciidoc | 1030 ++++++---
docs/asciidoc/command-line.asciidoc | 18 +-
docs/asciidoc/configuration.asciidoc | 33 +-
docs/asciidoc/examples.asciidoc | 352 ++-
docs/asciidoc/faq.asciidoc | 134 +-
docs/asciidoc/filter_elements.asciidoc | 387 +++-
docs/asciidoc/filters.asciidoc | 618 ++++--
docs/asciidoc/inc_filepath.asciidoc | 22 +
docs/asciidoc/inc_filter_by_aliases.asciidoc | 11 +
docs/asciidoc/inc_kinds.asciidoc | 92 +
docs/asciidoc/inc_sources.asciidoc | 52 +
docs/asciidoc/inc_strftime_table.asciidoc | 17 +
docs/asciidoc/inc_timestring_regex.asciidoc | 34 +
docs/asciidoc/inc_unit_table.asciidoc | 13 +
docs/asciidoc/index.asciidoc | 12 +-
docs/asciidoc/installation.asciidoc | 111 +-
docs/asciidoc/options.asciidoc | 2333 +++++++++++++++++++-
docs/asciidoc/security.asciidoc | 12 +-
docs/asciidoc/versions.asciidoc | 51 +
docs/conf.py | 6 +-
docs/filters.rst | 7 +
docs/index.rst | 8 +-
requirements.txt | 8 +-
setup.py | 10 +-
test/integration/test_alias.py | 128 +-
test/integration/test_allocation.py | 62 +-
test/integration/test_create_index.py | 18 +-
test/integration/test_delete_indices.py | 140 +-
test/integration/test_delete_snapshots.py | 2 +-
test/integration/test_es_repo_mgr.py | 2 +-
test/integration/test_integrations.py | 6 +-
test/integration/test_reindex.py | 405 ++++
test/integration/test_restore.py | 71 +-
test/integration/test_rollover.py | 312 +++
test/integration/test_snapshot.py | 8 +-
test/integration/testvars.py | 255 +++
test/unit/test_action_alias.py | 43 +-
test/unit/test_action_allocation.py | 41 +-
test/unit/test_action_close.py | 12 +-
test/unit/test_action_clusterrouting.py | 2 +-
test/unit/test_action_delete_indices.py | 14 +-
test/unit/test_action_delete_snapshots.py | 4 +
test/unit/test_action_forcemerge.py | 14 +-
test/unit/test_action_open.py | 8 +-
test/unit/test_action_reindex.py | 174 ++
test/unit/test_action_replicas.py | 14 +-
test/unit/test_action_restore.py | 11 +-
test/unit/test_action_rollover.py | 37 +
test/unit/test_action_snapshot.py | 40 +-
test/unit/test_class_index_list.py | 247 ++-
test/unit/test_class_snapshot_list.py | 63 +
test/unit/test_utils.py | 529 ++++-
test/unit/testvars.py | 67 +-
travis-run.sh | 48 +-
unix_packages/build_official_package.sh | 108 +-
unix_packages/build_package_from_source.sh | 86 +-
unix_packages/cx_freeze-5.0.1.dev.tar.gz | Bin 0 -> 86134 bytes
unix_packages/cx_freeze-5.0.dev.tar.gz | Bin 82899 -> 0 bytes
unix_packages/cx_freeze.setup.py.patch | 34 -
88 files changed, 10829 insertions(+), 1843 deletions(-)
diff --cc debian/.git-dpm
index 12c5a28,0000000..40fb137
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
- ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed
- ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed
- 0853854035a54106dd650b5d39fbd1691e4712a6
++7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae
++7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae
++5fff068865e60ba4ee51ccb04e44e074e2377aff
+5fff068865e60ba4ee51ccb04e44e074e2377aff
+elasticsearch-curator_5.1.2.orig.tar.gz
+2d554bd77b1866523aab0e80fc4337c1b9abcffb
+290616
+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 17ed4a9,0000000..410081d
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 ff4fa393ed74b77009ec8a11ed3157ad3e0fc5ed Mon Sep 17 00:00:00 2001
++From 7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae 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
++index d4e4540..b77a05f 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',
++- 'python': ('https://docs.python.org/3.6', None),
++- 'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/5.4.0', None),
+++ 'python': ('https://docs.python.org/3.6',
++ '/usr/share/doc/python3-doc/html/objects.inv'),
- + 'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0',
+++ 'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/5.4.0',
++ '/usr/share/doc/python-elasticsearch-doc/html/objects.inv'),
+ }
+
+ autoclass_content = "both"
diff --cc debian/patches/setup.py-read-README-utf-8
index a8838e6,0000000..9600a08
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 6982261c033a4667ce83f0d7b4a405e7f2e44e7d Mon Sep 17 00:00:00 2001
++From e60a1573616f9b0b61c752ac138eeeee5d6a0f42 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
++index 9d0bf67..ee13a6e 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