[Python-modules-commits] [yarl] 07/09: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Thu Feb 8 20:19:38 UTC 2018
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository yarl.
commit 3f4a066cfc77dddfe2af52fd89a81c259239c76e
Merge: 77a0d59 14b6c4d
Author: Piotr Ożarowski <piotr at debian.org>
Date: Thu Feb 8 20:32:15 2018 +0100
merge patched into master
CHANGES.rst | 35 +-
LICENSE | 2 +-
PKG-INFO | 951 +-
debian/.git-dpm | 6 +-
...-do-not-add-changelog-to-long-description.patch | 4 +-
debian/patches/0002-docs-disable-intersphinx.patch | 4 +-
...0003-docs-disable-sidebar_collapse-option.patch | 4 +-
...ble-privacy-breach-links-in-documentation.patch | 4 +-
docs/api.rst | 23 +-
docs/conf.py | 4 +-
docs/make.bat | 0
setup.cfg | 14 +-
setup.py | 2 +-
tests/test_normalize_path.py | 4 +-
tests/test_quoting.py | 262 +-
tests/test_update_query.py | 9 +-
tests/test_url.py | 45 +
tests/test_url_build.py | 26 +
yarl.egg-info/PKG-INFO | 951 +-
yarl.egg-info/requires.txt | 3 +-
yarl/__init__.py | 265 +-
yarl/__init__.pyi | 54 +-
yarl/_quoting.c | 10372 ++++++++++++++-----
yarl/_quoting.pyx | 551 +-
yarl/quoting.py | 287 +-
25 files changed, 9475 insertions(+), 4407 deletions(-)
diff --cc debian/.git-dpm
index 3000ae7,0000000..5f501f9
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
- 5c11042534d7e4a428589c7f085f163ef9c7d7b8
- 5c11042534d7e4a428589c7f085f163ef9c7d7b8
- 4e0762268a6c79f22c656e8bcda79f8cdc44c2c0
++14b6c4d7f76b6710b4541bb2f683483ec9a03f8c
++14b6c4d7f76b6710b4541bb2f683483ec9a03f8c
++19ec690ed8cbe72c3b71b5b2a8154e119420b351
+19ec690ed8cbe72c3b71b5b2a8154e119420b351
+yarl_1.1.0.orig.tar.gz
+f9216ded2e9f2006b470a34aed65e071a0971769
+156164
+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 c25b520,0000000..c7a4cc4
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 cffe119dcdf53e0b538ce39aafa169ea00d2f9b7 Mon Sep 17 00:00:00 2001
++From c833c70f67402256d317c974a0e9d9932d0e5e49 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
++index a385d34..cbb16e9 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 6626c99,0000000..00488a4
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 267717c27fda15e08209ec9160ffa2137cf6d6fc Mon Sep 17 00:00:00 2001
++From 9992f1ac17ac05f9fa81650870f8049eecf08223 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
++index fdbbf4e..daaad6f 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 08ff9ae,0000000..48e8230
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 8419046ba7abb27f0621d2bb504372500c084886 Mon Sep 17 00:00:00 2001
++From f07e0825fdc02b805e05961e880e89a1d89311b1 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
++index daaad6f..bc9613e 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 5509e9a,0000000..6e07a46
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 5c11042534d7e4a428589c7f085f163ef9c7d7b8 Mon Sep 17 00:00:00 2001
++From 14b6c4d7f76b6710b4541bb2f683483ec9a03f8c 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
++index bc9613e..806b2a1 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