[Python-modules-commits] [pytest] 05/06: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Sat Sep 3 09:19:27 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 194b81812b1a7d75999824eae2451f7cfe5a02fc
Merge: 696c89a c4d44c8
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Sep 3 11:10:54 2016 +0200
merge patched into master
AUTHORS | 3 +
CHANGELOG.rst | 40 +++++
PKG-INFO | 7 +-
README.rst | 5 +-
_pytest/__init__.py | 2 +-
_pytest/_code/code.py | 2 +-
_pytest/assertion/__init__.py | 6 +
_pytest/capture.py | 7 +
_pytest/config.py | 2 +
_pytest/debugging.py | 2 +-
_pytest/doctest.py | 2 +-
_pytest/python.py | 39 ++---
_pytest/unittest.py | 7 +-
debian/.git-dpm | 6 +-
debian/patches/intersphinx.patch | 4 +-
debian/patches/remove_google_js | 2 +-
doc/en/adopt.rst | 4 +
doc/en/announce/index.rst | 5 +-
doc/en/announce/release-2.9.1.rst | 2 +
doc/en/announce/release-2.9.2.rst | 7 +-
doc/en/announce/release-3.0.2.rst | 26 ++++
doc/en/announce/sprint2016.rst | 2 -
doc/en/assert.rst | 5 +-
doc/en/builtin.rst | 4 +-
doc/en/cache.rst | 10 +-
doc/en/capture.rst | 2 +-
doc/en/conf.py | 4 +-
doc/en/contents.rst | 29 +++-
doc/en/doctest.rst | 3 +-
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 | 8 +-
doc/en/example/simple.rst | 122 ++++++++++-----
doc/en/feedback.rst | 8 -
doc/en/fixture.rst | 10 +-
doc/en/funcarg_compare.rst | 1 +
doc/en/getting-started.rst | 12 +-
doc/en/index.rst | 141 +++++++++++-------
doc/en/monkeypatch.rst | 21 ---
doc/en/nose.rst | 2 +
doc/en/overview.rst | 13 --
doc/en/parametrize.rst | 5 +-
doc/en/plugins.rst | 4 +-
doc/en/proposals/parametrize_with_fixtures.rst | 2 +
doc/en/recwarn.rst | 1 +
doc/en/skipping.rst | 2 +-
doc/en/status.rst | 5 -
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 10 +-
doc/en/writing_plugins.rst | 6 +-
doc/en/xdist.rst | 197 -------------------------
doc/en/yieldfixture.rst | 2 +
pytest.egg-info/PKG-INFO | 7 +-
pytest.egg-info/SOURCES.txt | 5 +-
pytest.egg-info/requires.txt | 8 +-
setup.cfg | 4 +-
testing/python/metafunc.py | 12 ++
testing/test_assertion.py | 38 +++++
testing/test_capture.py | 22 +++
testing/test_pdb.py | 19 +++
tox.ini | 12 +-
63 files changed, 518 insertions(+), 474 deletions(-)
diff --cc debian/.git-dpm
index a9eb6ec,0000000..972aa58
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
- c6b172b6d44ab22f14c4e49aa5c0ecbdee119b1b
- c6b172b6d44ab22f14c4e49aa5c0ecbdee119b1b
- bc9cf593ab13c00bc281876945cd74df8f4b7cad
++c4d44c83c58a94456b92da746d48e55ec72f1faf
++c4d44c83c58a94456b92da746d48e55ec72f1faf
++20e0c867d27699949650cbc04588df00ff973f6d
+20e0c867d27699949650cbc04588df00ff973f6d
+pytest_3.0.2.orig.tar.gz
+735f6da188deca14fff78836b6ea81b8a35a44d2
+727551
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 8670040,0000000..04f0d2b
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From c6b172b6d44ab22f14c4e49aa5c0ecbdee119b1b Mon Sep 17 00:00:00 2001
++From c4d44c83c58a94456b92da746d48e55ec72f1faf 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 aca0442..f0eab9c 100644
++index 1c15c17..f42cb64 100644
+--- a/doc/en/conf.py
++++ b/doc/en/conf.py
+@@ -312,11 +312,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 382a1c2,0000000..592d6c5
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 5a5967d4037d900a2ae080fd51cc11b291df2482 Mon Sep 17 00:00:00 2001
++From bba1d97c00e94fa859fb90e93ac2f53b3b04f2dc 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