[Python-modules-commits] [yarl] 06/16: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository yarl.

commit 6b56353abafaddda062b970b1df16f3850d8a253
Merge: d0fb479 d1a342a
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Nov 29 13:08:18 2016 +0100

    merge patched into master

 CHANGES.rst                                                  |  5 +++++
 PKG-INFO                                                     |  7 ++++++-
 debian/.git-dpm                                              |  6 +++---
 .../0001-do-not-add-changelog-to-long-description.patch      |  6 +++---
 debian/patches/0002-docs-disable-intersphinx.patch           |  2 +-
 .../patches/0003-docs-disable-sidebar_collapse-option.patch  |  2 +-
 setup.cfg                                                    |  2 +-
 setup.py                                                     |  1 -
 tests/test_quoting.py                                        | 12 ++++++++++++
 yarl.egg-info/PKG-INFO                                       |  7 ++++++-
 yarl/__init__.py                                             |  2 +-
 yarl/_quoting.c                                              | 11 +++++------
 yarl/_quoting.pyx                                            |  2 +-
 13 files changed, 45 insertions(+), 20 deletions(-)

diff --cc debian/.git-dpm
index 2ae2f80,0000000..c027f56
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
- c11084a1fa4876b3e2e14704de5a2c5904b684dd
- c11084a1fa4876b3e2e14704de5a2c5904b684dd
- bab09dac17a4a328b1229158dd5aff4d04799945
++d1a342ac77e035fef6e165ab77defb71dacea2be
++d1a342ac77e035fef6e165ab77defb71dacea2be
++603ecca142eb0150e1f66eaeaa6a1caf5f24c208
 +603ecca142eb0150e1f66eaeaa6a1caf5f24c208
 +yarl_0.7.1.orig.tar.gz
 +a0d7c71903b413d36281328144e219d49b32770d
 +117874
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-do-not-add-changelog-to-long-description.patch
index 9e2caa7,0000000..1f17ee8
mode 100644,000000..100644
--- a/debian/patches/0001-do-not-add-changelog-to-long-description.patch
+++ b/debian/patches/0001-do-not-add-changelog-to-long-description.patch
@@@ -1,26 -1,0 +1,26 @@@
- From e179705bc47862ae7561c59fd5e49597910ad87d Mon Sep 17 00:00:00 2001
++From 5fcf3b9c24cba1292cc9adb2e4c94058fa637aa5 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
 +Date: Sun, 6 Nov 2016 22:11:09 +0100
 +Subject: do not add changelog to long description
 +
 +it contains non-ascii characters (and thus FTBFS) and we install it via
 +separate file anyway
 +---
 + setup.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 7885ec9..595f52d 100644
++index 5a7b698..7f30157 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -70,8 +70,8 @@ args = dict(
++@@ -69,8 +69,8 @@ args = dict(
 +     name='yarl',
 +     version=version,
 +     description=("Yet another URL library"),
 +-    long_description='\n\n'.join([read('README.rst'),
 +-                                  read('CHANGES.rst')]),
 ++    #long_description='\n\n'.join([read('README.rst'),
 ++    #                              read('CHANGES.rst')]),
 +     classifiers=[
 +         'License :: OSI Approved :: Apache Software License',
 +         'Intended Audience :: Developers',
diff --cc debian/patches/0002-docs-disable-intersphinx.patch
index 03d13a5,0000000..a055eae
mode 100644,000000..100644
--- a/debian/patches/0002-docs-disable-intersphinx.patch
+++ b/debian/patches/0002-docs-disable-intersphinx.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 5ef473d27b5a709c8dab1a0e2eac897b7fb9340b Mon Sep 17 00:00:00 2001
++From dc2923ed092d79b1bc91dd718c38284165d119dd Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
 +Date: Sun, 6 Nov 2016 22:12:57 +0100
 +Subject: docs: disable intersphinx
 +
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index b53d5a4..4599902 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -50,7 +50,7 @@ with _version_path.open() as fp:
 + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 + # ones.
 + extensions = [
 +-    'sphinx.ext.intersphinx',
 ++    #'sphinx.ext.intersphinx',
 +     'sphinx.ext.coverage',
 +     'sphinx.ext.doctest',
 +     'sphinx.ext.viewcode',
diff --cc debian/patches/0003-docs-disable-sidebar_collapse-option.patch
index b8dcaf1,0000000..7c80089
mode 100644,000000..100644
--- a/debian/patches/0003-docs-disable-sidebar_collapse-option.patch
+++ b/debian/patches/0003-docs-disable-sidebar_collapse-option.patch
@@@ -1,23 -1,0 +1,23 @@@
- From c11084a1fa4876b3e2e14704de5a2c5904b684dd Mon Sep 17 00:00:00 2001
++From d1a342ac77e035fef6e165ab77defb71dacea2be Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
 +Date: Sun, 6 Nov 2016 22:14:54 +0100
 +Subject: docs: disable sidebar_collapse option
 +
 +theme packaged in Debian doesn't have this option
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 4599902..3de0fb6 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -168,7 +168,7 @@ html_theme_options = {
 +     'body_text': '#482C0A',
 +     'sidebar_text': '#49443E',
 +     'sidebar_header': '#4B4032',
 +-    'sidebar_collapse': False,
 ++    #'sidebar_collapse': False,
 + }
 + 
 + # Theme options are theme-specific and customize the look and feel of a theme

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