[Python-modules-commits] [elasticsearch-curator] 05/06: merge patched into master
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Sat Sep 10 09:12:10 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 4799a1a0edb83145e0e7243330f48faafdad07a2
Merge: abdb604 16da01d
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Sat Sep 10 12:06:59 2016 +0300
merge patched into master
.travis.yml | 1 +
README.rst | 5 +-
curator/__init__.py | 3 +-
curator/_version.py | 2 +-
curator/actions.py | 10 +-
curator/cli.py | 93 +++---
curator/defaults/settings.py | 172 ++++-------
curator/indexlist.py | 332 ++++++++++++++-------
curator/repomgrcli.py | 20 +-
curator/snapshotlist.py | 185 +++++++++---
curator/utils.py | 145 +++++++--
curator/validators/__init__.py | 1 +
curator/validators/actions.py | 53 ++++
curator/validators/config_file.py | 50 ++++
curator/validators/filter_elements.py | 120 ++++++++
curator/validators/filters.py | 73 +++++
curator/validators/filtertypes.py | 107 +++++++
curator/validators/options.py | 200 +++++++++++++
curator/validators/schemacheck.py | 69 +++++
debian/.git-dpm | 6 +-
...local-inventory-references-for-intersphin.patch | 2 +-
debian/patches/setup.py-read-README-utf-8 | 4 +-
docs/Changelog.rst | 31 ++
docs/asciidoc/actions.asciidoc | 2 +
docs/asciidoc/command-line.asciidoc | 3 +
docs/asciidoc/configuration.asciidoc | 84 +++++-
docs/asciidoc/examples.asciidoc | 3 +
docs/asciidoc/faq.asciidoc | 27 ++
docs/asciidoc/filter_elements.asciidoc | 151 ++++++++++
docs/asciidoc/filters.asciidoc | 185 +++++++++---
docs/asciidoc/index.asciidoc | 4 +-
docs/asciidoc/installation.asciidoc | 4 +-
docs/asciidoc/options.asciidoc | 67 +++--
docs/filters.rst | 15 +
docs/utilities.rst | 3 +
requirements.txt | 3 +-
setup.py | 3 +-
test/integration/test_alias.py | 4 +-
test/integration/test_allocation.py | 4 +-
test/integration/test_cli.py | 74 ++++-
test/integration/test_close.py | 12 +-
test/integration/test_create_index.py | 2 +-
test/integration/test_delete_indices.py | 2 +-
test/integration/test_delete_snapshots.py | 4 +-
test/integration/test_envvars.py | 91 ++++++
test/integration/test_forcemerge.py | 2 +-
.../{test_replicas.py => test_integrations.py} | 43 +--
test/integration/test_open.py | 2 +-
test/integration/test_replicas.py | 4 +-
test/integration/test_restore.py | 2 +-
test/integration/test_snapshot.py | 4 +-
test/integration/testvars.py | 57 +++-
test/unit/test_action_close.py | 11 +
test/unit/test_class_index_list.py | 103 ++++++-
test/unit/test_class_snapshot_list.py | 53 +++-
test/unit/test_utils.py | 16 +
test/unit/test_validators.py | 222 ++++++++++++++
test/unit/testvars.py | 7 +
58 files changed, 2459 insertions(+), 498 deletions(-)
diff --cc debian/.git-dpm
index ad0e210,0000000..47ca8bf
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
- 15d9fedb2a140c523475824c9d45e91a02bdccb8
- 15d9fedb2a140c523475824c9d45e91a02bdccb8
- 7563cf75508aaec603f15adf396ceefe31c4c201
++16da01da01d8d5a387e85941cba8b696c149e4ba
++16da01da01d8d5a387e85941cba8b696c149e4ba
++546a322ecfac066daf70e100b263f127f2476c78
+546a322ecfac066daf70e100b263f127f2476c78
+elasticsearch-curator_4.1.0.orig.tar.gz
+2682e9a47dbae6b607ed8859189dfe205b0588b4
+123238
+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 11bbe02,0000000..8246f5f
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 15d9fedb2a140c523475824c9d45e91a02bdccb8 Mon Sep 17 00:00:00 2001
++From 16da01da01d8d5a387e85941cba8b696c149e4ba 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
+--- 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',
++ '/usr/share/doc/python3-doc/html/objects.inv'),
++ 'elasticsearch': ('http://elasticsearch-py.readthedocs.io/en/2.3.0',
++ '/usr/share/doc/python-elasticsearch-doc/html/objects.inv'),
+ }
+
+ autoclass_content = "both"
diff --cc debian/patches/setup.py-read-README-utf-8
index 945e537,0000000..611fb68
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 1075a5198601f4711a836d3fed638de7167476f7 Mon Sep 17 00:00:00 2001
++From abc074dae3bce28c4c2eaa8b160f5ff3fe77932f 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 b3713a8..121c9ed 100644
++index 3a0494d..bd9c857 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