[Python-modules-commits] [pytest] 05/07: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Thu Jul 13 11:24:49 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 58785a9e6d7a657ffe17fb7514c49f0c696994c1
Merge: ea785b4 c3a3e98
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Jul 13 13:23:28 2017 +0200
merge patched into master
.github/ISSUE_TEMPLATE.md | 8 ++
.github/PULL_REQUEST_TEMPLATE.md | 15 +++
.travis.yml | 51 ++++++++
CHANGELOG.rst | 52 +++++++-
LICENSE | 2 +-
MANIFEST.in | 39 ------
PKG-INFO | 4 +-
README.rst | 2 +-
_pytest/_code/code.py | 7 +-
_pytest/_version.py | 2 +-
_pytest/assertion/rewrite.py | 4 -
_pytest/doctest.py | 9 +-
_pytest/fixtures.py | 13 +-
_pytest/hookspec.py | 59 ++++++---
_pytest/impl | 254 ++++++++++++++++++++++++++++++++++++++
_pytest/main.py | 11 +-
_pytest/recwarn.py | 65 +++++-----
_pytest/terminal.py | 2 +-
appveyor.yml | 42 +++++++
changelog/_template.rst | 4 +-
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.1.3.rst | 23 ++++
doc/en/assert.rst | 4 +-
doc/en/doctest.rst | 2 +-
doc/en/example/markers.rst | 10 +-
doc/en/example/parametrize.rst | 2 +-
doc/en/fixture.rst | 100 +++++++++------
doc/en/getting-started.rst | 2 +-
doc/en/index.rst | 6 +-
doc/en/license.rst | 2 +-
doc/en/tmpdir.rst | 2 +-
doc/en/warnings.rst | 2 +-
doc/en/writing_plugins.rst | 6 +-
pyproject.toml | 4 +-
pytest.egg-info/PKG-INFO | 4 +-
pytest.egg-info/SOURCES.txt | 9 +-
scripts/check-manifest.py | 20 ---
tasks/__init__.py | 8 +-
tasks/requirements.txt | 3 +-
tasks/vendoring.py | 23 ++++
testing/acceptance_test.py | 4 +-
testing/code/test_excinfo.py | 23 ++++
testing/python/fixture.py | 33 +++++
testing/test_collection.py | 19 ++-
testing/test_doctest.py | 19 +++
testing/test_recwarn.py | 58 +++++++--
testing/test_runner.py | 4 +-
testing/test_terminal.py | 9 ++
tox.ini | 2 -
52 files changed, 834 insertions(+), 225 deletions(-)
diff --cc debian/.git-dpm
index dc6f4aa,0000000..99508da
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
- e095adf79bea97f87d85e70f6ff1b0bf32d35007
- e095adf79bea97f87d85e70f6ff1b0bf32d35007
- 8e6355fefd41619a68ed7c4183e001292a4427c3
++c3a3e980c77574d8371f90216e8010a5348c75f1
++c3a3e980c77574d8371f90216e8010a5348c75f1
++1f3ae240b868a1fffc4506451270d91075308281
+1f3ae240b868a1fffc4506451270d91075308281
+pytest_3.1.3.orig.tar.gz
+cd4071d489f61e7f5387e90d5f0eaef61a5f45d4
+768801
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 69b633e,0000000..dd640af
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From e095adf79bea97f87d85e70f6ff1b0bf32d35007 Mon Sep 17 00:00:00 2001
++From c3a3e980c77574d8371f90216e8010a5348c75f1 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 9ccc237,0000000..4f03fca
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 2e85910c12e9d9db283effefb764afba45135ea2 Mon Sep 17 00:00:00 2001
++From f4ff01973f164d1c07962615f3fddf3f46902749 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