[Python-modules-commits] [pytest] 09/09: merge patched into master

[Sebastian Ramacher]

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

sramacher pushed a commit to branch master
in repository pytest.

commit 280992210cba58527e08bddd3426ebfa2cc387ca
Merge: ca698ff 6dd7389
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jul 13 14:45:39 2017 +0200

    merge patched into master

 debian/.git-dpm                                | 6 +++---
 debian/patches/0003-Skip-test-under-PyPy.patch | 2 +-
 debian/patches/intersphinx.patch               | 2 +-
 debian/patches/remove_google_js                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index b67f235,0000000..cf63c52
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
- 0b40a2c804822083e5552526e13b5acccd8f8bb0
- 0b40a2c804822083e5552526e13b5acccd8f8bb0
- 1f3ae240b868a1fffc4506451270d91075308281
++6dd73896a4002b088d27c5070b541c1ffa5fae93
++6dd73896a4002b088d27c5070b541c1ffa5fae93
++aa68af9c74fc9fd8cfd4f41b0fb62518b564bad6
 +aa68af9c74fc9fd8cfd4f41b0fb62518b564bad6
 +pytest_3.1.3.orig.tar.gz
 +cd4071d489f61e7f5387e90d5f0eaef61a5f45d4
 +768801
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Skip-test-under-PyPy.patch
index 6660e9a,0000000..69b9fc1
mode 100644,000000..100644
--- a/debian/patches/0003-Skip-test-under-PyPy.patch
+++ b/debian/patches/0003-Skip-test-under-PyPy.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 0b40a2c804822083e5552526e13b5acccd8f8bb0 Mon Sep 17 00:00:00 2001
++From 6dd73896a4002b088d27c5070b541c1ffa5fae93 Mon Sep 17 00:00:00 2001
 +From: Sebastian Ramacher <sramacher at debian.org>
 +Date: Thu, 13 Jul 2017 13:44:54 +0200
 +Subject: Skip test under PyPy
 +
 +---
 + testing/test_warnings.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/testing/test_warnings.py b/testing/test_warnings.py
 +index 69bda11..9e23be8 100644
 +--- a/testing/test_warnings.py
 ++++ b/testing/test_warnings.py
 +@@ -138,7 +138,7 @@ def test_unicode(testdir, pyfile_with_warnings):
 +     ])
 + 
 + 
 +- at pytest.mark.skipif(sys.version_info >= (3, 0),
 ++ at pytest.mark.skipif(sys.version_info >= (3, 0) or  '__pypy__' in sys.builtin_module_names,
 +                     reason='warnings message is broken as it is not str instance')
 + def test_py2_unicode(testdir, pyfile_with_warnings):
 +     testdir.makepyfile('''
diff --cc debian/patches/intersphinx.patch
index dd640af,0000000..d670ee4
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From c3a3e980c77574d8371f90216e8010a5348c75f1 Mon Sep 17 00:00:00 2001
++From ef855b8a3fef9d9c798ac7bd787e0987edfdbbe6 Mon Sep 17 00:00:00 2001
 +From: Sebastian Ramacher <sramacher at debian.org>
 +Date: Thu, 14 Jul 2016 23:01:01 +0200
 +Subject: Use local intersphinx mappings
 +
 +Patch-Name: intersphinx.patch
 +---
 + doc/en/conf.py | 15 +++++++++++----
 + 1 file changed, 11 insertions(+), 4 deletions(-)
 +
 +diff --git a/doc/en/conf.py b/doc/en/conf.py
 +index 40f1e41..3bb64cc 100644
 +--- a/doc/en/conf.py
 ++++ b/doc/en/conf.py
 +@@ -309,11 +309,18 @@ texinfo_documents = [
 + ]
 + 
 + 
 +-# Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
 +-#                       'lib': ("http://docs.python.org/2.7library/", None),
 +-                    }
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 + 
 ++# Example configuration for intersphinx: refer to the Python standard library.
 ++intersphinx_mapping = {}
 ++intersphinx_mapping.update(
 ++    check_object_path('python',
 ++                      'http://docs.python.org/',
 ++                      '/usr/share/doc/python%d.%d/html/objects.inv' % \
 ++                       sys.version_info[:2]))
 + 
 + def setup(app):
 +     #from sphinx.ext.autodoc import cut_lines
diff --cc debian/patches/remove_google_js
index 4f03fca,0000000..5a5880f
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From f4ff01973f164d1c07962615f3fddf3f46902749 Mon Sep 17 00:00:00 2001
++From 13dcbddfb05360c79d348925d8ec5b705b7ede96 Mon Sep 17 00:00:00 2001
 +From: Simon Chopin <chopin.simon at gmail.com>
 +Date: Thu, 8 Oct 2015 11:04:33 -0700
 +Subject: Remove Google Analytics and Google+ javascript.
 +
 +It is not relevant for an offline and private installation.
 +Forwarded: not-needed
 +Last-Update: 2012-04-09
 +Patch-Name: remove_google_js
 +---
 + doc/en/_templates/layout.html | 13 -------------
 + 1 file changed, 13 deletions(-)
 +
 +diff --git a/doc/en/_templates/layout.html b/doc/en/_templates/layout.html
 +index 2fc8e2a..3e30439 100644
 +--- a/doc/en/_templates/layout.html
 ++++ b/doc/en/_templates/layout.html
 +@@ -4,17 +4,4 @@
 + {% endblock %}
 + {% block footer %}
 + {{ super() }}
 +-<script type="text/javascript">
 +-
 +-  var _gaq = _gaq || [];
 +-  _gaq.push(['_setAccount', 'UA-7597274-13']);
 +-  _gaq.push(['_trackPageview']);
 +-
 +-  (function() {
 +-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 +-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 +-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 +-  })();
 +-
 +-</script>
 + {% endblock %}

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