[Python-modules-commits] [pytest] 06/06: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Sun Aug 13 15:33:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
sramacher pushed a commit to branch master
in repository pytest.
commit 348a870b7aaa394a632937c327cb98a5c7061956
Merge: 06bf172 c4ab2a8
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Aug 13 17:33:05 2017 +0200
merge patched into master
AUTHORS | 1 +
CHANGELOG.rst | 32 +++++-
HOWTORELEASE.rst | 2 +-
PKG-INFO | 2 +-
_pytest/_version.py | 2 +-
_pytest/capture.py | 15 ++-
_pytest/config.py | 25 +++--
_pytest/pytester.py | 12 ++-
_pytest/runner.py | 7 +-
_pytest/terminal.py | 23 +++--
debian/.git-dpm | 6 +-
debian/patches/0003-Skip-test-under-PyPy.patch | 2 +-
debian/patches/intersphinx.patch | 2 +-
debian/patches/remove_google_js | 2 +-
doc/en/announce/index.rst | 1 +
doc/en/announce/release-3.2.1.rst | 22 ++++
doc/en/example/simple.rst | 12 +--
doc/en/mark.rst | 1 +
doc/en/skipping.rst | 1 +
doc/en/unittest.rst | 135 +++++++++++++++----------
doc/en/usage.rst | 7 ++
pytest.egg-info/PKG-INFO | 2 +-
pytest.egg-info/SOURCES.txt | 1 +
testing/acceptance_test.py | 15 ++-
testing/test_capture.py | 17 ++++
testing/test_config.py | 12 ++-
testing/test_terminal.py | 10 ++
27 files changed, 274 insertions(+), 95 deletions(-)
diff --cc debian/.git-dpm
index 3e17c32,0000000..2b13770
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
- 35d32e76eea2b787d44c81d14ae32db32d225d95
- 35d32e76eea2b787d44c81d14ae32db32d225d95
- a287af18dc26f9dac41517ef7d2a7f754eb6331f
++c4ab2a85aace5a87483f1ad5d987746e47d1db83
++c4ab2a85aace5a87483f1ad5d987746e47d1db83
++2b84ea7e78403f265ecc8a9b2852c13aa9552e4b
+2b84ea7e78403f265ecc8a9b2852c13aa9552e4b
+pytest_3.2.1.orig.tar.gz
+ab87dcfd371e38a691448303da811bd3aa9d123e
+784076
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Skip-test-under-PyPy.patch
index 447f7a8,0000000..23fe720
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 35d32e76eea2b787d44c81d14ae32db32d225d95 Mon Sep 17 00:00:00 2001
++From c4ab2a85aace5a87483f1ad5d987746e47d1db83 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 1328cc3..56dec1c 100644
+--- a/testing/test_warnings.py
++++ b/testing/test_warnings.py
+@@ -141,7 +141,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 901c4ae,0000000..3ce1be5
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From b3b9b9d66e9becae1344ba0d11854ac8a5bac457 Mon Sep 17 00:00:00 2001
++From ff65e82ff7492ee94b5813e4e2e3bc3308b3a021 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 a3b2166,0000000..c50b1b1
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 37d06864c95125757a255d65607bbc613be162cb Mon Sep 17 00:00:00 2001
++From ff6d37a1ea280411065fff16f0e8ac50b75cf11e 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
More information about the Python-modules-commits
mailing list