[Python-modules-commits] [elasticsearch-curator] 14/18: merge patched into master
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Tue Oct 17 08:17:37 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 7d14fc28cbdfe63bbbe9f7e9c48cc62e7bbbf5a8
Merge: 2440e90 ebdb03d
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Tue Oct 17 10:56:46 2017 +0300
merge patched into master
.travis.yml | 2 +-
CONTRIBUTORS | 4 +
curator/_version.py | 2 +-
curator/actions.py | 354 ++++++++++++++++++++-
curator/cli.py | 31 +-
curator/defaults/filter_elements.py | 6 +
curator/defaults/filtertypes.py | 1 +
curator/defaults/option_defaults.py | 44 ++-
curator/defaults/settings.py | 2 +
curator/indexlist.py | 34 +-
curator/utils.py | 83 ++++-
curator/validators/options.py | 15 +
debian/.git-dpm | 6 +-
...local-inventory-references-for-intersphin.patch | 2 +-
debian/patches/setup.py-read-README-utf-8 | 2 +-
docs/Changelog.rst | 43 +++
docs/actionclasses.rst | 31 +-
docs/asciidoc/actions.asciidoc | 112 +++++++
docs/asciidoc/examples.asciidoc | 59 +++-
docs/asciidoc/filter_elements.asciidoc | 86 +++++
docs/asciidoc/filters.asciidoc | 1 +
docs/asciidoc/inc_kinds.asciidoc | 2 +-
docs/asciidoc/index.asciidoc | 4 +-
docs/asciidoc/options.asciidoc | 289 ++++++++++++++++-
test/integration/test_delete_indices.py | 164 ++++++++++
test/integration/test_rollover.py | 52 ++-
test/integration/testvars.py | 17 +
test/unit/test_utils.py | 42 ++-
test/unit/testvars.py | 11 +-
29 files changed, 1443 insertions(+), 58 deletions(-)
diff --cc debian/.git-dpm
index d771b0f,0000000..fe02e64
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
- 7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae
- 7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae
- 5fff068865e60ba4ee51ccb04e44e074e2377aff
++ebdb03def66cd90fca30a1653919bd0161c10f7d
++ebdb03def66cd90fca30a1653919bd0161c10f7d
++ea25a657dc671aa8c45963ae04c6ed6daa1da5df
+ea25a657dc671aa8c45963ae04c6ed6daa1da5df
+elasticsearch-curator_5.2.0.orig.tar.gz
+ae7bbf3113c80beaa881dd66e1ed23ecc5c1e348
+301134
+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 410081d,0000000..b1101a8
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 7bf31d8a1f4e0c9fc143097c7c6e1dde35be7fae Mon Sep 17 00:00:00 2001
++From ebdb03def66cd90fca30a1653919bd0161c10f7d 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 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.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/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 9600a08,0000000..984177c
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 e60a1573616f9b0b61c752ac138eeeee5d6a0f42 Mon Sep 17 00:00:00 2001
++From cf948409b776e10fe2c576f8e5b6e2a5379a312d 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 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