[Python-modules-commits] [pytest] 05/05: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Sat Oct 1 10:17:01 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 59507474384635cfef781532bb1e5f8c7472d11b
Merge: 484da89 5a235d4
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Oct 1 10:53:09 2016 +0200
merge patched into master
AUTHORS | 3 ++
CHANGELOG.rst | 44 +++++++++++++++++++++-
HOWTORELEASE.rst | 12 +++---
PKG-INFO | 2 +-
_pytest/__init__.py | 2 +-
_pytest/_code/code.py | 3 ++
_pytest/_code/source.py | 11 +++---
_pytest/assertion/util.py | 2 +-
_pytest/cacheprovider.py | 0
_pytest/config.py | 27 +++++++------
_pytest/fixtures.py | 24 +++++++++++-
_pytest/mark.py | 2 +-
_pytest/python.py | 18 +++++----
_pytest/vendored_packages/README.md | 2 +-
.../pluggy-0.3.1.dist-info/RECORD | 8 ----
.../pluggy-0.3.1.dist-info/metadata.json | 1 -
.../pluggy-0.3.1.dist-info/pbr.json | 1 -
.../DESCRIPTION.rst | 1 +
.../pluggy-0.4.0.dist-info/INSTALLER | 1 +
.../pluggy-0.4.0.dist-info/LICENSE.txt | 22 +++++++++++
.../METADATA | 5 ++-
.../pluggy-0.4.0.dist-info/RECORD | 9 +++++
.../WHEEL | 2 +-
.../pluggy-0.4.0.dist-info/metadata.json | 1 +
.../top_level.txt | 0
_pytest/vendored_packages/pluggy.py | 41 ++++++++++++++++----
debian/.git-dpm | 6 +--
debian/patches/intersphinx.patch | 6 +--
debian/patches/remove_google_js | 2 +-
doc/en/Makefile | 19 +---------
doc/en/_getdoctarget.py | 16 --------
doc/en/_templates/links.html | 2 +-
doc/en/announce/index.rst | 1 +
doc/en/announce/release-3.0.2.rst | 10 ++---
.../{release-3.0.2.rst => release-3.0.3.rst} | 21 ++++++-----
doc/en/assert.rst | 4 +-
doc/en/cache.rst | 6 +--
doc/en/capture.rst | 2 +-
doc/en/conf.py | 7 +---
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 | 2 +-
doc/en/example/simple.rst | 22 +++++------
doc/en/fixture.rst | 10 ++---
doc/en/getting-started.rst | 4 +-
doc/en/index.rst | 2 +-
doc/en/monkeypatch.rst | 1 +
doc/en/parametrize.rst | 7 +---
doc/en/skipping.rst | 40 +++++++++++++++++++-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 8 +++-
pytest.egg-info/PKG-INFO | 2 +-
pytest.egg-info/SOURCES.txt | 17 +++++----
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/top_level.txt | 2 +-
testing/python/fixture.py | 16 ++++++++
testing/python/metafunc.py | 16 ++++++++
testing/test_assertion.py | 30 +++++++++++++--
testing/test_cache.py | 0
tox.ini | 11 +++---
63 files changed, 391 insertions(+), 203 deletions(-)
diff --cc debian/.git-dpm
index c5bdaa2,0000000..3b25005
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
- c4d44c83c58a94456b92da746d48e55ec72f1faf
- c4d44c83c58a94456b92da746d48e55ec72f1faf
- 20e0c867d27699949650cbc04588df00ff973f6d
++5a235d49c4a23d707a3d257ff7c086804f2e2569
++5a235d49c4a23d707a3d257ff7c086804f2e2569
++4258035b4ba1fcc9844bc8f259c4a04e49b47001
+4258035b4ba1fcc9844bc8f259c4a04e49b47001
+pytest_3.0.3.orig.tar.gz
+e7fb899ecac031a84e66f991289203d3c1f7c6cb
+731934
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 04f0d2b,0000000..5794b0b
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From c4d44c83c58a94456b92da746d48e55ec72f1faf Mon Sep 17 00:00:00 2001
++From 5a235d49c4a23d707a3d257ff7c086804f2e2569 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 1c15c17..f42cb64 100644
++index f3b8d7d..a736ab5 100644
+--- a/doc/en/conf.py
++++ b/doc/en/conf.py
- @@ -312,11 +312,18 @@ texinfo_documents = [
++@@ -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 592d6c5,0000000..6f0d529
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From bba1d97c00e94fa859fb90e93ac2f53b3b04f2dc Mon Sep 17 00:00:00 2001
++From 20faf3a1a5dea157f8065fb74da8a4b897b8daff 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