[Python-modules-commits] [python-cement] 06/13: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Sep 8 08:26:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-cement.
commit dbbe0553c59a69ffd85e5b457f2a6cb600f37037
Merge: 41d434a dc6701b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Jul 18 12:12:46 2016 +0200
merge patched into master
.gitignore | 3 +
.travis.yml | 2 +-
CONTRIBUTORS | 2 +
ChangeLog | 34 +-
README.md | 8 +-
cement/core/backend.py | 6 +-
cement/core/controller.py | 5 +-
cement/core/extension.py | 3 -
cement/core/foundation.py | 217 +++++++++++--
cement/core/handler.py | 76 ++++-
cement/core/interface.py | 8 +
cement/core/log.py | 11 +-
cement/core/output.py | 52 ++-
cement/core/plugin.py | 2 +-
cement/ext/ext_argcomplete.py | 4 +-
cement/ext/ext_argparse.py | 25 +-
cement/ext/ext_colorlog.py | 2 +-
cement/ext/ext_configobj.py | 4 +-
cement/ext/ext_configparser.py | 3 +-
cement/ext/ext_dummy.py | 2 +-
cement/ext/ext_genshi.py | 3 +-
cement/ext/ext_handlebars.py | 255 +++++++++++++++
cement/ext/{ext_genshi.py => ext_jinja2.py} | 66 ++--
cement/ext/ext_json.py | 62 +++-
cement/ext/ext_json_configobj.py | 16 +-
cement/ext/ext_logging.py | 49 ++-
cement/ext/ext_memcached.py | 1 -
cement/ext/ext_mustache.py | 10 +-
cement/ext/ext_plugin.py | 48 ++-
cement/ext/{ext_memcached.py => ext_redis.py} | 152 +++++----
cement/ext/ext_reload_config.py | 5 +-
cement/ext/ext_tabulate.py | 3 +-
cement/ext/ext_watchdog.py | 355 +++++++++++++++++++++
cement/ext/ext_yaml.py | 12 +-
cement/ext/ext_yaml_configobj.py | 2 -
cement/utils/misc.py | 34 +-
cement/utils/shell.py | 8 +-
cement/utils/test.py | 30 +-
debian/.git-dpm | 6 +-
...es-and-mailinglist-signup-form-from-docum.patch | 4 +-
...2-Don-t-use-license-text-in-documentation.patch | 4 +-
.../0003-Do-not-install-examples-package.patch | 2 +-
doc/build/.placeholder | 0
doc/source/api/ext/ext_genshi.rst | 2 +-
doc/source/api/ext/ext_handlebars.rst | 9 +
doc/source/api/ext/ext_jinja2.rst | 9 +
doc/source/api/ext/ext_redis.rst | 9 +
doc/source/api/ext/ext_watchdog.rst | 9 +
doc/source/api/index.rst | 5 +
doc/source/conf.py | 6 +-
doc/source/dev/application_design.rst | 2 +-
doc/source/dev/boss_templates.rst | 2 +-
doc/source/dev/interfaces_and_handlers.rst | 4 +-
doc/source/dev/logging.rst | 8 +-
doc/source/dev/output.rst | 3 +-
doc/source/dev/plugins.rst | 76 ++++-
doc/source/dev/quickstart.rst | 2 +-
doc/source/dev/testing.rst | 8 +-
doc/source/examples/sighup_reload.rst | 4 +-
doc/source/index.rst | 8 +-
doc/source/upgrading.rst | 20 ++
doc/source/whats_new.rst | 159 ++++++++-
examples/abstract_base_controllers/myapp.py | 104 ++++++
examples/app_version/myapp.py | 35 ++
examples/append_config_path/myapp.py | 39 +++
examples/arbitrary_extra_arguments/myapp.py | 48 +++
examples/bash_auto_completion/myapp.py | 85 +++++
examples/controllers_with_same_label/myapp.py | 72 +++++
examples/load_extensions_via_config/myapp.py | 46 +++
examples/multiple_stacked_controllers/myapp.py | 89 ++++++
examples/reload_config/myapp.py | 39 +++
requirements-dev-py3.txt | 5 +
requirements-dev.txt | 5 +
scripts/devtools.py | 18 +-
scripts/travis.sh | 1 +
scripts/vagrant/up.sh | 51 ++-
setup.cfg | 1 +
tests/core/backend_tests.py | 2 +
tests/core/config_tests.py | 9 +-
tests/core/foundation_tests.py | 52 +++
tests/core/handler_tests.py | 32 +-
tests/core/hook_tests.py | 2 +
tests/core/interface_tests.py | 5 +
tests/core/log_tests.py | 3 +-
tests/core/output_tests.py | 12 +-
tests/core/plugin_tests.py | 183 ++++-------
tests/ext/alarm_tests.py | 1 +
tests/ext/argparse_tests.py | 28 +-
tests/ext/configobj_tests.py | 17 +-
tests/ext/daemon_tests.py | 26 +-
tests/ext/genshi_tests.py | 1 +
tests/ext/handlebars_tests.py | 61 ++++
tests/ext/jinja2_tests.py | 93 ++++++
tests/ext/json_configobj_tests.py | 13 +-
tests/ext/json_tests.py | 7 +-
tests/ext/logging_tests.py | 22 +-
tests/ext/memcached_tests.py | 2 +
tests/ext/mustache_tests.py | 1 +
tests/ext/redis_tests.py | 55 ++++
tests/ext/tabulate_tests.py | 1 +
tests/ext/watchdog_tests.py | 94 ++++++
tests/ext/yaml_configobj_tests.py | 17 +-
tests/ext/yaml_tests.py | 11 +-
tests/templates/bad_template.handlebars | 0
tests/templates/bad_template.jinja2 | 0
tests/templates/test_base_template.handlebars | 1 +
tests/templates/test_partial_template.handlebars | 1 +
tests/templates/test_template.handlebars | 1 +
tests/templates/test_template.jinja2 | 1 +
tests/templates/test_template_child.jinja2 | 2 +
tests/templates/test_template_parent.jinja2 | 1 +
tests/templates/test_template_utf8.jinja2 | 1 +
tests/utils/fs_tests.py | 27 +-
tests/utils/misc_tests.py | 7 +-
tests/utils/version_tests.py | 2 +-
115 files changed, 2800 insertions(+), 573 deletions(-)
diff --cc debian/.git-dpm
index b2aaf7c,0000000..29ce64c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 61784ba9ca4fac6a63f00dfb82a4d15b57187f99
- 61784ba9ca4fac6a63f00dfb82a4d15b57187f99
- 71b6945457b2a54e3bbda057f92942fcadb82305
++dc6701b6981ea2b2490551f76ac1d64f0927fd44
++dc6701b6981ea2b2490551f76ac1d64f0927fd44
++b82fca7bb8fa81246ba820510a1a6b3d6488223e
+b82fca7bb8fa81246ba820510a1a6b3d6488223e
+python-cement_2.10.0.orig.tar.gz
+b36f995240475e3d8ee35e94700d63c84910bd88
+179447
diff --cc debian/patches/0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
index 9d2b27a,0000000..8a6c95a
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
+++ b/debian/patches/0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
@@@ -1,56 -1,0 +1,56 @@@
- From e482d27faec5373ae0019f0a2106798ce2c4563c Mon Sep 17 00:00:00 2001
++From 48dbf9f38f0da9ee918c4bb0b374bd8d128952a2 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Fri, 20 May 2016 08:55:11 +0200
+Subject: Remove badges and mailinglist signup form from documentation.
+
+This prevents privacy breaches from loading hosted assets.
+---
+ doc/source/index.rst | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/doc/source/index.rst b/doc/source/index.rst
- index 81be775..de3fd7f 100644
++index a59ec03..7aacc12 100644
+--- a/doc/source/index.rst
++++ b/doc/source/index.rst
+@@ -19,10 +19,6 @@ seen several iterations in design, and has continued to grow and improve
+ since it's inception. Cement is the most stable, and complete framework for
+ command line and backend application development.
+
+-.. image:: https://secure.travis-ci.org/datafolklabs/cement.svg
+- :target: https://travis-ci.org/#!/datafolklabs/cement
+-.. image:: https://badges.gitter.im/Join%20Chat.svg
+- :target: https://gitter.im/datafolklabs/cement
+
+ Core features include (but are not limited to):
+
+@@ -70,30 +66,6 @@ new releases, important features, and other related news. This not an open
+ email thread, but rather an extremely minimal, low noise announcement only
+ list. You can unsubscribe at any time.
+
+-.. raw:: html
+-
+- <!-- Begin MailChimp Signup Form -->
+- <link href="http://cdn-images.mailchimp.com/embedcode/slim-081711.css" rel="stylesheet" type="text/css">
+- <style type="text/css">
+- #mc_embed_signup{background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; }
+- /* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
+- We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
+- </style>
+- <div id="mc_embed_signup">
+- <form action="http://datafolklabs.us7.list-manage.com/subscribe/post?u=444ce23fdf1c30e830f893b57&id=7be3a6a31e" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+- <div id="mc_embed_signup_scroll">
+-
+- <input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="email address" required>
+- <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+- <div style="position: absolute; left: -5000px;"><input type="text" name="b_444ce23fdf1c30e830f893b57_7be3a6a31e" tabindex="-1" value=""></div>
+- <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
+- </div>
+- </form>
+- </div>
+- <BR />
+-
+- <!--End mc_embed_signup-->
+-
+
+ Documentation
+ -------------
diff --cc debian/patches/0002-Don-t-use-license-text-in-documentation.patch
index f73c721,0000000..c933128
mode 100644,000000..100644
--- a/debian/patches/0002-Don-t-use-license-text-in-documentation.patch
+++ b/debian/patches/0002-Don-t-use-license-text-in-documentation.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69 Mon Sep 17 00:00:00 2001
++From dfbd98f56e435c63c415bf97245913ed167c858b Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Fri, 20 May 2016 09:17:21 +0200
+Subject: Don't use license text in documentation.
+
+It is already shipped by all binary packages.
+---
+ doc/source/index.rst | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/source/index.rst b/doc/source/index.rst
- index de3fd7f..01ef356 100644
++index 7aacc12..5fd98d2 100644
+--- a/doc/source/index.rst
++++ b/doc/source/index.rst
+@@ -74,7 +74,6 @@ Documentation
+ :maxdepth: 1
+
+ changes
+- license
+ contributors
+ upgrading
+ whats_new
diff --cc debian/patches/0003-Do-not-install-examples-package.patch
index 78690ef,0000000..9114070
mode 100644,000000..100644
--- a/debian/patches/0003-Do-not-install-examples-package.patch
+++ b/debian/patches/0003-Do-not-install-examples-package.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 61784ba9ca4fac6a63f00dfb82a4d15b57187f99 Mon Sep 17 00:00:00 2001
++From dc6701b6981ea2b2490551f76ac1d64f0927fd44 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Tue, 12 Jul 2016 10:30:37 +0200
+Subject: Do not install examples package.
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index d1318e7..784988c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -40,7 +40,7 @@ setup(name='cement',
+ author_email='team at datafolklabs.com',
+ url='http://builtoncement.org',
+ license='BSD',
+- packages=find_packages(exclude=['ez_setup', 'tests*']),
++ packages=find_packages(exclude=['ez_setup', 'tests*', 'examples*']),
+ include_package_data=True,
+ zip_safe=False,
+ test_suite='nose.collector',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cement.git
More information about the Python-modules-commits
mailing list