[Python-modules-commits] [pytest] 05/06: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Tue Nov 15 22:19:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
sramacher pushed a commit to branch master
in repository pytest.
commit 535bd5513f56f8219673ccc8d7da66dec75a7a1e
Merge: bbf20b4 3aa2ae4
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue Nov 15 22:56:38 2016 +0100
merge patched into master
AUTHORS | 4 +++
CHANGELOG.rst | 61 +++++++++++++++++++++++++++++++++++--
PKG-INFO | 2 +-
_pytest/__init__.py | 2 +-
_pytest/_code/code.py | 20 ++++++++----
_pytest/assertion/rewrite.py | 7 ++++-
_pytest/compat.py | 16 +++++++++-
_pytest/config.py | 5 +--
_pytest/helpconfig.py | 4 +--
_pytest/junitxml.py | 6 +++-
_pytest/pytester.py | 2 --
_pytest/python.py | 58 +++++++++++++++++++++++------------
_pytest/recwarn.py | 7 ++++-
_pytest/terminal.py | 12 ++++++++
_pytest/unittest.py | 3 ++
debian/.git-dpm | 6 ++--
debian/patches/intersphinx.patch | 2 +-
debian/patches/remove_google_js | 2 +-
doc/en/announce/index.rst | 1 +
doc/en/announce/release-3.0.4.rst | 29 ++++++++++++++++++
doc/en/assert.rst | 4 +--
doc/en/cache.rst | 6 ++--
doc/en/capture.rst | 2 +-
doc/en/doctest.rst | 2 +-
doc/en/example/markers.rst | 28 ++++++++---------
doc/en/example/nonpython.rst | 6 ++--
doc/en/example/parametrize.rst | 12 ++++----
doc/en/example/pythoncollection.rst | 6 ++--
doc/en/example/reportingdemo.rst | 4 +--
doc/en/example/simple.rst | 22 ++++++-------
doc/en/fixture.rst | 16 ++++++----
doc/en/getting-started.rst | 4 +--
doc/en/goodpractices.rst | 3 +-
doc/en/index.rst | 2 +-
doc/en/monkeypatch.rst | 8 +++++
doc/en/parametrize.rst | 4 +--
doc/en/skipping.rst | 2 +-
doc/en/talks.rst | 2 +-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 2 +-
doc/en/usage.rst | 4 ---
pytest.egg-info/PKG-INFO | 2 +-
pytest.egg-info/SOURCES.txt | 1 +
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/requires.txt | 6 ++--
testing/acceptance_test.py | 2 +-
testing/code/test_excinfo.py | 44 ++++++++++++++++++++++++++
testing/python/collect.py | 35 ++++++++++++++++++++-
testing/python/raises.py | 30 ++++++++++++++++++
testing/test_assertion.py | 31 +++++++++++++++++++
testing/test_assertrewrite.py | 16 ++++++++++
testing/test_collection.py | 11 -------
testing/test_junitxml.py | 24 +++++++++++++++
testing/test_parseopt.py | 14 ++++++++-
testing/test_pdb.py | 47 +++++++++++++---------------
testing/test_pluginmanager.py | 12 ++++++--
testing/test_skipping.py | 2 +-
testing/test_terminal.py | 27 +++++++++++++++-
testing/test_unittest.py | 23 ++++++++++++++
tox.ini | 28 +++++++++++------
60 files changed, 575 insertions(+), 172 deletions(-)
diff --cc debian/.git-dpm
index 0087c8c,0000000..d10b1cd
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
- 5a235d49c4a23d707a3d257ff7c086804f2e2569
- 5a235d49c4a23d707a3d257ff7c086804f2e2569
- 4258035b4ba1fcc9844bc8f259c4a04e49b47001
++3aa2ae41ef5778eaa1b06f488bd0c58f2a167fa2
++3aa2ae41ef5778eaa1b06f488bd0c58f2a167fa2
++a1b7b4becdc2cab51918c0c562cfd75cdcb0111b
+a1b7b4becdc2cab51918c0c562cfd75cdcb0111b
+pytest_3.0.4.orig.tar.gz
+bf8fe7e5a787e47b479f0ab5f657313da2142a1b
+733339
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 5794b0b,0000000..6d9ac7b
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 5a235d49c4a23d707a3d257ff7c086804f2e2569 Mon Sep 17 00:00:00 2001
++From 3aa2ae41ef5778eaa1b06f488bd0c58f2a167fa2 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 f3b8d7d..a736ab5 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 6f0d529,0000000..3246d78
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 20faf3a1a5dea157f8065fb74da8a4b897b8daff Mon Sep 17 00:00:00 2001
++From 928df7f0bc2b3ebdb8f7b57cfdfd17d372c20988 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