[Python-modules-commits] [pytest] 05/08: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Mon Jun 12 20:46:43 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 94b02d1709d2cc55fac196b1ab333716ce9bc619
Merge: b28273b e095adf
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Jun 12 22:31:29 2017 +0200
merge patched into master
.gitattributes | 1 +
.gitignore | 39 ++++
AUTHORS | 16 ++
CHANGELOG.rst | 245 ++++++++++++++++++++-
CONTRIBUTING.rst | 10 +-
HOWTORELEASE.rst | 92 +++-----
MANIFEST.in | 3 +
PKG-INFO | 17 +-
README.rst | 15 +-
_pytest/__init__.py | 10 +-
_pytest/_argcomplete.py | 2 +-
_pytest/_code/__init__.py | 1 +
_pytest/_code/_py2traceback.py | 1 +
_pytest/_code/code.py | 51 ++++-
_pytest/_code/source.py | 2 +-
_pytest/_pluggy.py | 2 +-
_pytest/_version.py | 4 +
_pytest/assertion/__init__.py | 25 +--
_pytest/assertion/rewrite.py | 7 +-
_pytest/assertion/truncate.py | 102 +++++++++
_pytest/assertion/util.py | 7 +-
_pytest/cacheprovider.py | 12 +-
_pytest/capture.py | 61 ++++-
_pytest/compat.py | 76 ++++++-
_pytest/config.py | 110 +++++----
_pytest/debugging.py | 39 ++--
_pytest/deprecated.py | 2 +-
_pytest/doctest.py | 36 ++-
_pytest/fixtures.py | 79 +++----
_pytest/freeze_support.py | 5 +-
_pytest/helpconfig.py | 37 +++-
_pytest/hookspec.py | 9 +-
_pytest/junitxml.py | 54 ++++-
_pytest/main.py | 71 +++---
_pytest/mark.py | 175 ++++++++++-----
_pytest/monkeypatch.py | 9 +-
_pytest/nose.py | 19 +-
_pytest/pastebin.py | 2 +
_pytest/pytester.py | 49 +++--
_pytest/python.py | 185 +++++++++-------
_pytest/recwarn.py | 72 ++----
_pytest/resultlog.py | 5 +-
_pytest/runner.py | 34 +--
_pytest/setuponly.py | 2 +
_pytest/setupplan.py | 2 +
_pytest/skipping.py | 68 +++---
_pytest/terminal.py | 72 ++++--
_pytest/tmpdir.py | 2 +
_pytest/unittest.py | 48 ++--
_pytest/vendored_packages/pluggy.py | 2 +-
_pytest/warnings.py | 88 ++++++++
changelog/_template.rst | 39 ++++
debian/.git-dpm | 6 +-
debian/patches/intersphinx.patch | 2 +-
debian/patches/remove_google_js | 2 +-
doc/en/Makefile | 9 +-
doc/en/announce/index.rst | 3 +
doc/en/announce/release-3.1.0.rst | 61 +++++
doc/en/announce/release-3.1.1.rst | 23 ++
doc/en/announce/release-3.1.2.rst | 23 ++
doc/en/assert.rst | 25 ++-
doc/en/cache.rst | 6 +-
doc/en/capture.rst | 2 +-
doc/en/contents.rst | 3 +-
doc/en/customize.rst | 28 ++-
doc/en/doctest.rst | 15 +-
doc/en/example/assertion/failure_demo.py | 12 +-
.../example/assertion/test_setup_flow_example.py | 2 +-
doc/en/example/attic.rst | 4 +-
doc/en/example/costlysetup/conftest.py | 2 +-
doc/en/example/markers.rst | 38 ++--
doc/en/example/multipython.py | 2 +-
doc/en/example/nonpython.rst | 6 +-
doc/en/example/parametrize.rst | 36 ++-
doc/en/example/pythoncollection.py | 2 +-
doc/en/example/pythoncollection.rst | 8 +-
doc/en/example/reportingdemo.rst | 39 ++--
doc/en/example/simple.rst | 27 +--
doc/en/example/special.rst | 4 +-
doc/en/existingtestsuite.rst | 34 +++
doc/en/fixture.rst | 24 +-
doc/en/funcarg_compare.rst | 2 +-
doc/en/genapi.py | 2 +-
doc/en/getting-started.rst | 7 +-
doc/en/goodpractices.rst | 133 +++++++----
doc/en/index.rst | 2 +-
doc/en/nose.rst | 13 +-
doc/en/parametrize.rst | 42 +++-
doc/en/recwarn.rst | 140 +-----------
doc/en/requirements.txt | 3 +
doc/en/skipping.rst | 245 ++++++++++-----------
doc/en/talks.rst | 15 +-
doc/en/test/attic.rst | 2 +-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 7 +-
doc/en/usage.rst | 27 ++-
doc/en/{recwarn.rst => warnings.rst} | 119 +++++++++-
doc/en/writing_plugins.rst | 7 +-
pyproject.toml | 35 +++
pytest.egg-info/PKG-INFO | 17 +-
pytest.egg-info/SOURCES.txt | 21 ++
pytest.egg-info/requires.txt | 2 +-
pytest.py | 72 +++++-
scripts/check-manifest.py | 5 +-
scripts/check-rst.py | 11 +
setup.cfg | 5 +-
setup.py | 44 ++--
tasks/__init__.py | 9 +
tasks/generate.py | 162 ++++++++++++++
tasks/release.minor.rst | 27 +++
tasks/release.patch.rst | 17 ++
tasks/requirements.txt | 4 +
testing/acceptance_test.py | 72 +++++-
testing/code/test_code.py | 7 +-
testing/code/test_excinfo.py | 44 +++-
testing/code/test_source.py | 23 +-
testing/deprecated_test.py | 5 +-
testing/python/approx.py | 2 +-
testing/python/collect.py | 112 +++++++---
testing/python/fixture.py | 139 ++++++------
testing/python/integration.py | 18 +-
testing/python/metafunc.py | 207 ++++++++++++-----
testing/python/raises.py | 27 ++-
testing/test_argcomplete.py | 4 +-
testing/test_assertion.py | 173 +++++++++++----
testing/test_assertrewrite.py | 43 +++-
testing/test_cache.py | 33 ++-
testing/test_capture.py | 48 ++--
testing/test_collection.py | 53 +++--
testing/test_compat.py | 34 ++-
testing/test_config.py | 42 ++--
testing/test_conftest.py | 21 +-
testing/test_doctest.py | 68 +++++-
testing/test_entry_points.py | 1 +
testing/test_helpconfig.py | 3 +-
testing/test_junitxml.py | 93 +++++++-
testing/test_mark.py | 82 +++++--
testing/test_modimport.py | 25 +++
testing/test_monkeypatch.py | 9 +-
testing/test_nose.py | 11 +-
testing/test_parseopt.py | 21 +-
testing/test_pastebin.py | 7 +-
testing/test_pdb.py | 68 ++++--
testing/test_pluginmanager.py | 25 ++-
testing/test_pytester.py | 7 +-
testing/test_recwarn.py | 65 ++++--
testing/test_resultlog.py | 3 +-
testing/test_runner.py | 20 +-
testing/test_runner_xunit.py | 24 +-
testing/test_session.py | 13 +-
testing/test_skipping.py | 21 +-
testing/test_terminal.py | 43 ++--
testing/test_tmpdir.py | 5 +-
testing/test_unittest.py | 5 +-
testing/test_warnings.py | 190 ++++++++++++++++
tox.ini | 20 +-
156 files changed, 4084 insertions(+), 1615 deletions(-)
diff --cc debian/.git-dpm
index b4fba4a,0000000..37c866a
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
- 51fa133e19bd914b08f70d3d78763647043f92ca
- 51fa133e19bd914b08f70d3d78763647043f92ca
- 7ffbaa40a33a9ba777e46f42958249eda9cdbc6d
++e095adf79bea97f87d85e70f6ff1b0bf32d35007
++e095adf79bea97f87d85e70f6ff1b0bf32d35007
++8e6355fefd41619a68ed7c4183e001292a4427c3
+8e6355fefd41619a68ed7c4183e001292a4427c3
+pytest_3.1.2.orig.tar.gz
+a93bd4b734f520af96481e595b2ccb9d06d6cce3
+766406
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 587ea66,0000000..69b633e
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 51fa133e19bd914b08f70d3d78763647043f92ca Mon Sep 17 00:00:00 2001
++From e095adf79bea97f87d85e70f6ff1b0bf32d35007 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 711558c,0000000..9ccc237
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From f5680f6776f1a6799a7ebfd37d25d95c646242f7 Mon Sep 17 00:00:00 2001
++From 2e85910c12e9d9db283effefb764afba45135ea2 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