[Python-modules-commits] [ruamel.yaml] 03/06: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sat May 21 15:05:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch master
in repository ruamel.yaml.
commit f44ae6b255fa5cb8dc61f894c0893872df753d59
Merge: fb244c7 eef955c
Author: Vincent Bernat <bernat at debian.org>
Date: Sat May 21 16:53:58 2016 +0200
merge patched into master
.hg_archival.txt | 4 +-
.hgignore | 1 +
.hgtags | 12 +
CHANGES | 11 +
README.rst | 277 +-------------------
__init__.py | 8 +-
_doc/Makefile | 216 ++++++++++++++++
_doc/conf.py | 287 +++++++++++++++++++++
README.rst => _doc/detail.rst | 237 +++++++++--------
_doc/example.rst | 102 ++++++++
_doc/index.rst | 23 ++
_doc/install.rst | 31 +++
_doc/links.rst | 7 +
_doc/overview.rst | 31 +++
_doc/pyyaml.rst | 68 +++++
_test/lib/canonical.py | 22 +-
_test/lib/test_all.py | 6 +-
_test/lib/test_appliance.py | 6 +-
_test/lib/test_build.py | 11 +-
_test/lib/test_build_ext.py | 11 +-
_test/lib/test_canonical.py | 16 +-
_test/lib/test_constructor.py | 97 ++++---
_test/lib/test_emitter.py | 16 +-
_test/lib/test_errors.py | 7 +-
_test/lib/test_input_output.py | 40 +--
_test/lib/test_mark.py | 2 +-
_test/lib/test_reader.py | 5 +-
_test/lib/test_recursive.py | 7 +-
_test/lib/test_representer.py | 4 +-
_test/lib/test_resolver.py | 17 +-
_test/lib/test_structure.py | 22 +-
_test/lib/test_yaml.py | 24 +-
_test/roundtrip.py | 33 ++-
_test/test_anchor.py | 1 -
_test/test_comments.py | 134 +++++++---
_test/test_fail.py | 214 +++++++++++++++
_test/test_indentation.py | 286 ++++++++++++++------
_test/test_tag.py | 32 +++
_test/test_version.py | 104 ++++++++
_test/test_z_data.py | 5 +-
comments.py | 33 ++-
compat.py | 16 +-
composer.py | 2 +
configobjwalker.py | 68 +----
constructor.py | 54 +++-
cyaml.py | 14 +-
debian/.git-dpm | 6 +-
.../patches/0001-Don-t-require-ruamel.base.patch | 34 ---
debian/patches/series | 1 -
dumper.py | 32 ++-
emitter.py | 121 +++++----
error.py | 10 +-
events.py | 1 +
example/anchor_merge.py | 1 -
example/so_13517753.py | 42 ++-
ext/_ruamel_yaml.c | 12 +-
ext/_ruamel_yaml.pyx | 2 +-
loader.py | 26 +-
main.py | 72 +++++-
make_win_whl.py | 34 ---
nodes.py | 2 +
parser_.py => parser.py | 40 ++-
reader.py | 6 +-
representer.py | 23 +-
resolver.py | 166 +++++++++++-
scalarstring.py | 2 +
scanner.py | 8 +-
serializer.py | 32 +--
setup.py | 15 +-
tokens.py | 3 +
tox.ini | 2 +-
util.py | 139 ++++++++++
72 files changed, 2494 insertions(+), 962 deletions(-)
diff --cc debian/.git-dpm
index c5e45cf,0000000..a7f37e9
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
- 4b514f34f4432a9076d1a44eda27206af94f9777
- 4b514f34f4432a9076d1a44eda27206af94f9777
- 17155daee3ae933ffd61dcdd2805ca84186a66e0
++eef955ca3518072814e84efd9a068413befadf71
++eef955ca3518072814e84efd9a068413befadf71
++eef955ca3518072814e84efd9a068413befadf71
+eef955ca3518072814e84efd9a068413befadf71
+ruamel.yaml_0.11.11.orig.tar.gz
+c4647ef4b1fd6f7c6d464305b0e7024fd5719165
+291518
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ruamel.yaml.git
More information about the Python-modules-commits
mailing list