[Python-modules-commits] [ruamel.yaml] 02/03: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository ruamel.yaml.

commit a9f4b38d4fcec5372188e57206f477aa1e7f96d1
Merge: cb90aa7 8c69522
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Dec 5 17:19:43 2015 +0100

    merge patched into master

 __init__.py                                        |  5 +--
 debian/.git-dpm                                    |  4 +--
 .../patches/0001-Don-t-require-ruamel.base.patch   | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 ruamel.yaml.egg-info/requires.txt                  |  1 -
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index d02df68,0000000..7ce179e
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
- 3088dac69e227ca3cb17a24f025c8037194c06ed
- 3088dac69e227ca3cb17a24f025c8037194c06ed
++8c69522ccf63f624d4d4dffe9bb0eff886ba1c1d
++8c69522ccf63f624d4d4dffe9bb0eff886ba1c1d
 +3088dac69e227ca3cb17a24f025c8037194c06ed
 +3088dac69e227ca3cb17a24f025c8037194c06ed
 +ruamel.yaml_0.10.12.orig.tar.gz
 +ca3474abf3db064e3e740146fdfaf6871dd612de
 +234712
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-require-ruamel.base.patch
index 0000000,0000000..a373bf1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-require-ruamel.base.patch
@@@ -1,0 -1,0 +1,42 @@@
++From 8c69522ccf63f624d4d4dffe9bb0eff886ba1c1d Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sat, 5 Dec 2015 17:19:06 +0100
++Subject: Don't require ruamel.base
++
++This is a useless dependency. We never had it in Debian, so don't need
++to handle upgrade or conflicts for that.
++---
++ __init__.py                       | 5 +++--
++ ruamel.yaml.egg-info/requires.txt | 1 -
++ 2 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/__init__.py b/__init__.py
++index be2bf4ba5e7f..45ef3fe81b81 100644
++--- a/__init__.py
+++++ b/__init__.py
++@@ -5,7 +5,9 @@ from __future__ import absolute_import
++ 
++ # install_requires of ruamel.base is not really required but the old
++ # ruamel.base installed __init__.py, and thus a new version should
++-# be installed at some point
+++# be installed at some point.
+++#
+++# Debian-specific: removed this requirement.
++ 
++ _package_data = dict(
++     full_package_name="ruamel.yaml",
++@@ -15,7 +17,6 @@ _package_data = dict(
++     description="ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order",  # NOQA
++     entry_points=None,
++     install_requires=dict(
++-        any=["ruamel.base>=1.0.0"],
++         py26=["ruamel.ordereddict"],
++         py27=["ruamel.ordereddict"]
++     ),
++diff --git a/ruamel.yaml.egg-info/requires.txt b/ruamel.yaml.egg-info/requires.txt
++index aa524f6e7a5f..89d5b7265b66 100644
++--- a/ruamel.yaml.egg-info/requires.txt
+++++ b/ruamel.yaml.egg-info/requires.txt
++@@ -1,2 +1 @@
++-ruamel.base>=1.0.0
++ ruamel.ordereddict
diff --cc debian/patches/series
index 0000000,0000000..7bd6431
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-require-ruamel.base.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ruamel.yaml.git