[Python-modules-commits] [pytest] 05/08: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Thu Jan 26 17:12:40 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 1072de8d269a56617d3d14baf3fa33d079d9ca20
Merge: 62e5be8 0522ce0
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Jan 26 09:09:35 2017 +0100
merge patched into master
.gitattributes | 1 +
.gitignore | 36 +
AUTHORS | 3 +
CHANGELOG.rst | 345 ++---
PKG-INFO | 4 +-
_pytest/__init__.py | 2 +-
_pytest/cacheprovider.py | 0
_pytest/compat.py | 21 +-
_pytest/config.py | 82 +-
_pytest/main.py | 48 +-
_pytest/monkeypatch.py | 6 +-
_pytest/pytester.py | 7 +-
_pytest/recwarn.py | 5 +-
_pytest/skipping.py | 2 +-
debian/.git-dpm | 6 +-
debian/patches/intersphinx.patch | 4 +-
debian/patches/remove_google_js | 2 +-
doc/en/announce/index.rst | 1 +
doc/en/announce/release-2.0.2.rst | 4 +-
doc/en/announce/release-2.0.3.rst | 4 +-
doc/en/announce/release-2.2.1.rst | 2 +-
doc/en/announce/release-2.2.4.rst | 2 +-
doc/en/announce/release-2.3.0.rst | 4 +-
doc/en/announce/release-2.3.2.rst | 2 +-
doc/en/announce/release-2.3.3.rst | 6 +-
doc/en/announce/release-2.3.5.rst | 8 +-
doc/en/announce/release-2.4.0.rst | 4 +-
doc/en/announce/release-2.5.0.rst | 4 +-
doc/en/announce/release-2.5.2.rst | 2 +-
doc/en/announce/release-2.6.3.rst | 2 +-
doc/en/announce/release-2.7.1.rst | 2 +-
doc/en/announce/release-2.9.2.rst | 2 +-
doc/en/announce/release-3.0.6.rst | 33 +
doc/en/assert.rst | 53 +-
doc/en/cache.rst | 8 +-
doc/en/capture.rst | 2 +-
doc/en/conf.py | 2 +-
doc/en/doctest.rst | 2 +-
doc/en/example/markers.rst | 50 +-
doc/en/example/nonpython.rst | 6 +-
doc/en/example/parametrize.rst | 20 +-
doc/en/example/pythoncollection.rst | 8 +-
doc/en/example/reportingdemo.rst | 2 +-
doc/en/example/simple.rst | 28 +-
doc/en/faq.rst | 8 -
doc/en/fixture.rst | 19 +-
doc/en/funcarg_compare.rst | 2 +-
doc/en/getting-started.rst | 4 +-
doc/en/goodpractices.rst | 2 +-
doc/en/index.rst | 2 +-
doc/en/monkeypatch.rst | 4 +-
doc/en/parametrize.rst | 4 +-
doc/en/{parametrize.rst => parametrize.rst.orig} | 26 +-
doc/en/projects.rst | 2 +-
doc/en/skipping.rst | 4 +-
doc/en/test/plugin/xdist.rst | 2 +-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 2 +-
doc/en/usage.rst | 8 +-
doc/en/writing_plugins.rst | 6 +-
pytest.egg-info/PKG-INFO | 4 +-
pytest.egg-info/SOURCES.txt | 6 +
pytest.egg-info/requires.txt | 1 +
setup.cfg | 4 +-
setup.py | 3 +-
testing/python/metafunc.py.orig | 1494 ++++++++++++++++++++++
testing/test_assertion.py | 17 +
testing/test_assertrewrite.py | 18 +-
testing/test_cache.py | 0
testing/test_compat.py | 50 +
testing/test_config.py | 38 +
testing/test_doctest.py | 8 +-
testing/test_monkeypatch.py | 14 +-
testing/test_pytester.py | 7 +
testing/test_recwarn.py | 33 +-
tox.ini | 7 +-
76 files changed, 2226 insertions(+), 412 deletions(-)
diff --cc debian/.git-dpm
index f98d2a3,0000000..9ed36c1
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
- 87bb9d9c26d539317d01c9bebc44c0366bed878c
- 87bb9d9c26d539317d01c9bebc44c0366bed878c
- 67133214465533c29639c0c0aad1a4d8a7b4dab6
++0522ce0b62c58959b4e733dd686706e62fba6073
++0522ce0b62c58959b4e733dd686706e62fba6073
++094551e172d9415ad7c68b3d0aa2e63b76e920bc
+094551e172d9415ad7c68b3d0aa2e63b76e920bc
+pytest_3.0.6.orig.tar.gz
+16a43b3e6908ccdff64079a82b9c065cc5ff3a33
+748748
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index b00d399,0000000..dbf8c9f
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 87bb9d9c26d539317d01c9bebc44c0366bed878c Mon Sep 17 00:00:00 2001
++From 0522ce0b62c58959b4e733dd686706e62fba6073 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
++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 74f14a5,0000000..68475db
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 19adb5fce691071fbe32264ef9bba0fdb2715074 Mon Sep 17 00:00:00 2001
++From 3c64bc322679543f5563b60dd8a0d5385bf665b2 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