[Python-modules-commits] [elasticsearch-curator] 05/11: merge patched into master
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Fri Dec 16 13:07:14 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 18761ebd1711b8627d34a92b72bb083a6d753a00
Merge: 422ec2c acc0aa5
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Fri Dec 16 11:08:37 2016 +0200
merge patched into master
.gitignore | 3 +
.travis.yml | 4 +-
README.rst | 89 ++-
Vagrant/centos/6/Vagrantfile | 18 +
Vagrant/centos/7/Vagrantfile | 18 +
Vagrant/ubuntu/14.04/Vagrantfile | 19 +
curator/_version.py | 2 +-
curator/actions.py | 87 +++
curator/cli.py | 50 +-
curator/config_utils.py | 49 ++
curator/curator.py | 5 -
curator/curator_cli.py | 5 +
curator/defaults/settings.py | 8 +-
curator/es_repo_mgr.py | 4 -
curator/indexlist.py | 2 +-
curator/repomgrcli.py | 73 +--
curator/singletons.py | 695 +++++++++++++++++++++
curator/snapshotlist.py | 1 +
curator/utils.py | 50 +-
curator/validators/actions.py | 11 +-
curator/validators/config_file.py | 34 +-
curator/validators/filter_elements.py | 36 +-
curator/validators/filters.py | 30 +-
curator/validators/filtertypes.py | 15 +-
curator/validators/options.py | 76 ++-
debian/.git-dpm | 6 +-
...local-inventory-references-for-intersphin.patch | 2 +-
debian/patches/setup.py-read-README-utf-8 | 4 +-
docs/Changelog.rst | 172 +++++
docs/actionclasses.rst | 6 +
docs/asciidoc/actions.asciidoc | 59 +-
docs/asciidoc/command-line.asciidoc | 180 +++++-
docs/asciidoc/configuration.asciidoc | 24 +-
docs/asciidoc/examples.asciidoc | 90 ++-
docs/asciidoc/faq.asciidoc | 70 +++
docs/asciidoc/getting_started.asciidoc | 22 -
docs/asciidoc/index.asciidoc | 6 +-
docs/asciidoc/installation.asciidoc | 385 ++++++++----
docs/asciidoc/options.asciidoc | 43 +-
docs/asciidoc/security.asciidoc | 104 +++
docs/asciidoc/upgrading.asciidoc | 29 -
requirements.txt | 5 +-
run_curator.py | 33 +-
run_es_repo_mgr.py | 33 +-
run_singleton.py | 37 ++
setup.py | 49 +-
test/integration/__init__.py | 4 +-
.../{test_forcemerge.py => test_clusterrouting.py} | 34 +-
test/integration/test_es_repo_mgr.py | 139 ++---
test/integration/test_forcemerge.py | 8 +-
test/integration/testvars.py | 24 +
test/unit/test_action_alias.py | 12 +
test/unit/test_action_allocation.py | 9 +
test/unit/test_action_close.py | 6 +
test/unit/test_action_clusterrouting.py | 76 +++
test/unit/test_action_delete_indices.py | 7 +
test/unit/test_action_forcemerge.py | 7 +
test/unit/test_action_open.py | 4 +
test/unit/test_action_replicas.py | 6 +
test/unit/test_action_restore.py | 3 +
test/unit/test_action_snapshot.py | 13 +
test/unit/test_class_index_list.py | 90 +++
test/unit/test_utils.py | 13 +
travis-run.sh | 6 +-
unix_packages/build_official_package.sh | 157 +++++
unix_packages/build_package_from_source.sh | 155 +++++
unix_packages/cx_freeze-5.0.dev.tar.gz | Bin 0 -> 82899 bytes
unix_packages/cx_freeze.setup.py.patch | 34 +
68 files changed, 2981 insertions(+), 569 deletions(-)
diff --cc debian/.git-dpm
index 182115f,0000000..82c0992
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
- 16da01da01d8d5a387e85941cba8b696c149e4ba
- 16da01da01d8d5a387e85941cba8b696c149e4ba
- 546a322ecfac066daf70e100b263f127f2476c78
++acc0aa55d20342d00b836491a650915dabb741c4
++acc0aa55d20342d00b836491a650915dabb741c4
++1ea533b9c772000e427d8b03a2b425489821d25a
+1ea533b9c772000e427d8b03a2b425489821d25a
+elasticsearch-curator_4.2.4.orig.tar.gz
+011b3cb34eb2927d732cf2ce0d22eabb3e45b9b1
+225965
+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 8246f5f,0000000..f86303f
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 16da01da01d8d5a387e85941cba8b696c149e4ba Mon Sep 17 00:00:00 2001
++From acc0aa55d20342d00b836491a650915dabb741c4 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 611fb68,0000000..19b9230
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 abc074dae3bce28c4c2eaa8b160f5ff3fe77932f Mon Sep 17 00:00:00 2001
++From 644ce9423f45c94087058c331d1ee619bdd40afa 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 3a0494d..bd9c857 100644
++index 01ae5f1..e6f755f 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