[Python-modules-commits] [yarl] 07/08: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Sun Jul 16 12:14:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository yarl.
commit 3f6a8396965a6a3516fb3e451477c1e3ed1ba117
Merge: 2685090 819e263
Author: Piotr Ożarowski <piotr at debian.org>
Date: Sun Jul 16 14:11:04 2017 +0200
merge patched into master
CHANGES.rst | 7 +
PKG-INFO | 12 +-
README.rst | 3 +
debian/.git-dpm | 6 +-
...-do-not-add-changelog-to-long-description.patch | 2 +-
debian/patches/0002-docs-disable-intersphinx.patch | 2 +-
...0003-docs-disable-sidebar_collapse-option.patch | 2 +-
...ble-privacy-breach-links-in-documentation.patch | 2 +-
docs/api.rst | 6 +-
tests/test_update_query.py | 154 +++++++++++++++++++++
tests/test_url.py | 149 +-------------------
yarl.egg-info/PKG-INFO | 12 +-
yarl.egg-info/SOURCES.txt | 2 +
yarl/__init__.py | 4 +-
yarl/__init__.pyi | 32 +++--
yarl/_quoting.c | 10 +-
yarl/_quoting.pyi | 5 +
yarl/_quoting.pyx | 4 +-
18 files changed, 243 insertions(+), 171 deletions(-)
diff --cc debian/.git-dpm
index d76ea55,0000000..54e28f7
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
- 3a37b3f3cd79376944817f090c0a295d32a48c11
- 3a37b3f3cd79376944817f090c0a295d32a48c11
- c0e15ae13eb375021d634686ae021a73d284c471
++819e263fc56c87c6268af17769225581230a8495
++819e263fc56c87c6268af17769225581230a8495
++39878b79830132ac7dc6d4b5ad138c3d6b3543e1
+39878b79830132ac7dc6d4b5ad138c3d6b3543e1
+yarl_0.12.0.orig.tar.gz
+d8c9fa86a8ebab54d7d48b2c49dd126243d5c92c
+132769
+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 56ca142,0000000..3ae176f
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 daa5e5f5bd9ae96531173afc1ed06bd0f898e816 Mon Sep 17 00:00:00 2001
++From 643627175c74bbbd0892306bc1b765e955f6ab97 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 4ab4004..272be95 100644
+--- a/setup.py
++++ b/setup.py
+@@ -75,8 +75,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 899680e,0000000..325b1ae
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 b3b409ac375f1ff3681c47a5f4a6531e817af734 Mon Sep 17 00:00:00 2001
++From 517ab862b9d2e40883bba6c5b533007813febe82 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 196c4ad..aba4128 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 59216c2,0000000..4431bf9
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 3ea4dc4f753b1dac7a94c32c6dcf1c4aa902e734 Mon Sep 17 00:00:00 2001
++From d953539e725f8075ecbdd317868c5059958fa173 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 aba4128..c27f4a7 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
diff --cc debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
index 52344fc,0000000..d44af10
mode 100644,000000..100644
--- a/debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
+++ b/debian/patches/0004-disable-privacy-breach-links-in-documentation.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 3a37b3f3cd79376944817f090c0a295d32a48c11 Mon Sep 17 00:00:00 2001
++From 819e263fc56c87c6268af17769225581230a8495 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr at debian.org>
+Date: Tue, 20 Jun 2017 20:13:42 +0200
+Subject: disable privacy breach links in documentation
+
+---
+ docs/conf.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index c27f4a7..afd4f69 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -155,13 +155,13 @@ html_theme = 'alabaster'
+ html_theme_options = {
+ 'logo': 'yarl-icon-128x128.png',
+ 'description': 'Yet another URL library',
+- 'github_user': 'aio-libs',
+- 'github_repo': 'yarl',
+- 'github_button': True,
+- 'github_type': 'star',
+- 'github_banner': True,
+- 'travis_button': True,
+- 'codecov_button': True,
++# 'github_user': 'aio-libs',
++# 'github_repo': 'yarl',
++# 'github_button': True,
++# 'github_type': 'star',
++# 'github_banner': True,
++# 'travis_button': True,
++# 'codecov_button': True,
+ 'pre_bg': '#FFF6E5',
+ 'note_bg': '#E5ECD1',
+ 'note_border': '#BFCF8C',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/yarl.git
More information about the Python-modules-commits
mailing list