[Python-modules-commits] [yarl] 13/16: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Wed Dec 21 12:00:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository yarl.
commit 7625742c42e0c54b3608519ffbcf6ae53c0a9283
Merge: d85bc85 a4ced16
Author: Piotr Ożarowski <piotr at debian.org>
Date: Wed Dec 21 12:49:57 2016 +0100
merge patched into master
CHANGES.rst | 16 +
PKG-INFO | 18 +-
debian/.git-dpm | 6 +-
...-do-not-add-changelog-to-long-description.patch | 6 +-
debian/patches/0002-docs-disable-intersphinx.patch | 2 +-
...0003-docs-disable-sidebar_collapse-option.patch | 2 +-
setup.cfg | 2 +-
setup.py | 9 +-
tests/test_quoting.py | 67 +-
tests/test_url.py | 39 +-
yarl.egg-info/PKG-INFO | 18 +-
yarl/__init__.py | 73 +-
yarl/_quoting.c | 2012 +++++++++++++-------
yarl/_quoting.pyx | 65 +-
yarl/quoting.py | 51 +-
15 files changed, 1548 insertions(+), 838 deletions(-)
diff --cc debian/.git-dpm
index b247428,0000000..838757d
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
- d1a342ac77e035fef6e165ab77defb71dacea2be
- d1a342ac77e035fef6e165ab77defb71dacea2be
- 603ecca142eb0150e1f66eaeaa6a1caf5f24c208
++a4ced1666a049c3449810edc24928eb4b81f9236
++a4ced1666a049c3449810edc24928eb4b81f9236
++6865bfe0a98dfd7d8728744eaee4ed065edf6669
+6865bfe0a98dfd7d8728744eaee4ed065edf6669
+yarl_0.8.1.orig.tar.gz
+cccb192a637a44123feaee6a9610b0b00038d4d9
+121256
+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 1f17ee8,0000000..4bed5d3
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 5fcf3b9c24cba1292cc9adb2e4c94058fa637aa5 Mon Sep 17 00:00:00 2001
++From 00a08911c833e5eb3943ae97543ad20b460955a6 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 5a7b698..7f30157 100644
++index dc133d3..71d0696 100644
+--- a/setup.py
++++ b/setup.py
- @@ -69,8 +69,8 @@ args = dict(
++@@ -76,8 +76,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 a055eae,0000000..ab0f704
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 dc2923ed092d79b1bc91dd718c38284165d119dd Mon Sep 17 00:00:00 2001
++From ed281990d6e97e94f00f999840aed7ce93969b5d 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 7c80089,0000000..899a50f
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 d1a342ac77e035fef6e165ab77defb71dacea2be Mon Sep 17 00:00:00 2001
++From a4ced1666a049c3449810edc24928eb4b81f9236 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
More information about the Python-modules-commits
mailing list