[Python-modules-commits] [pytest] 06/07: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Sun Aug 6 23:16: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 6a9a2bc46329d56397cd1c651eb51b55cfac5323
Merge: 42a6732 35d32e7
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Aug 7 01:16:15 2017 +0200
merge patched into master
.travis.yml | 11 +-
AUTHORS | 9 +
CHANGELOG.rst | 166 +++++++
CONTRIBUTING.rst | 73 ++-
PKG-INFO | 2 +-
_pytest/_argcomplete.py | 7 +-
_pytest/_code/_py2traceback.py | 5 +-
_pytest/_code/code.py | 71 +--
_pytest/_code/source.py | 46 +-
_pytest/_version.py | 2 +-
_pytest/assertion/__init__.py | 1 -
_pytest/assertion/rewrite.py | 29 +-
_pytest/assertion/util.py | 26 +-
_pytest/cacheprovider.py | 59 ++-
_pytest/capture.py | 34 +-
_pytest/compat.py | 32 +-
_pytest/config.py | 96 ++--
_pytest/debugging.py | 2 +-
_pytest/deprecated.py | 17 +-
_pytest/doctest.py | 38 +-
_pytest/fixtures.py | 91 ++--
_pytest/freeze_support.py | 1 -
_pytest/helpconfig.py | 45 +-
_pytest/hookspec.py | 78 ++-
_pytest/impl | 254 ----------
_pytest/junitxml.py | 12 +-
_pytest/main.py | 112 +++--
_pytest/mark.py | 116 ++++-
_pytest/monkeypatch.py | 6 +-
_pytest/nose.py | 5 +-
_pytest/outcomes.py | 140 ++++++
_pytest/pastebin.py | 8 +-
_pytest/pytester.py | 92 ++--
_pytest/python.py | 626 ++++---------------------
_pytest/python_api.py | 616 ++++++++++++++++++++++++
_pytest/recwarn.py | 7 +-
_pytest/resultlog.py | 13 +-
_pytest/runner.py | 206 +++-----
_pytest/skipping.py | 74 ++-
_pytest/terminal.py | 75 +--
_pytest/tmpdir.py | 4 +-
_pytest/unittest.py | 10 +-
_pytest/warnings.py | 12 +-
appveyor.yml | 2 +
changelog/_template.rst | 3 +-
debian/.git-dpm | 6 +-
debian/patches/0003-Skip-test-under-PyPy.patch | 6 +-
debian/patches/intersphinx.patch | 2 +-
debian/patches/remove_google_js | 2 +-
doc/en/_templates/globaltoc.html | 1 +
doc/en/announce/index.rst | 1 +
doc/en/announce/release-3.2.0.rst | 48 ++
doc/en/builtin.rst | 28 +-
doc/en/cache.rst | 16 +-
doc/en/contact.rst | 5 +-
doc/en/contents.rst | 4 +-
doc/en/customize.rst | 72 ++-
doc/en/example/attic.rst | 2 +-
doc/en/example/index.rst | 4 +-
doc/en/example/markers.rst | 29 +-
doc/en/example/parametrize.rst | 6 +-
doc/en/example/reportingdemo.rst | 2 +-
doc/en/example/simple.rst | 43 +-
doc/en/fixture.rst | 16 +-
doc/en/getting-started.rst | 3 +-
doc/en/goodpractices.rst | 9 -
doc/en/historical-notes.rst | 177 +++++++
doc/en/nose.rst | 2 +-
doc/en/parametrize.rst | 35 +-
doc/en/pythonpath.rst | 71 +++
doc/en/setup.rst | 10 -
doc/en/skipping.rst | 61 ---
doc/en/unittest.rst | 16 +-
doc/en/usage.rst | 96 ++--
doc/en/warnings.rst | 34 ++
doc/en/writing_plugins.rst | 124 +++--
pytest.egg-info/PKG-INFO | 2 +-
pytest.egg-info/SOURCES.txt | 8 +-
pytest.egg-info/requires.txt | 1 +
pytest.py | 6 +-
setup.py | 3 +-
testing/acceptance_test.py | 24 +-
testing/code/test_code.py | 24 +-
testing/code/test_excinfo.py | 152 ++++--
testing/code/test_source.py | 91 ++--
testing/code/test_source_multiline_block.py | 26 +
testing/deprecated_test.py | 4 +
testing/freeze/create_executable.py | 1 -
testing/freeze/runtests_script.py | 2 +-
testing/freeze/tests/test_trivial.py | 3 +-
testing/freeze/tox_run.py | 2 +-
testing/python/approx.py | 292 ++++++++----
testing/python/collect.py | 57 ++-
testing/python/fixture.py | 174 +++++--
testing/python/integration.py | 8 +-
testing/python/metafunc.py | 165 ++++---
testing/python/raises.py | 1 -
testing/python/setup_only.py | 2 +-
testing/test_argcomplete.py | 29 +-
testing/test_assertion.py | 65 ++-
testing/test_assertrewrite.py | 42 +-
testing/test_cache.py | 202 +++++++-
testing/test_capture.py | 62 ++-
testing/test_collection.py | 79 +++-
testing/test_config.py | 20 +-
testing/test_conftest.py | 81 ++--
testing/test_doctest.py | 36 +-
testing/test_helpconfig.py | 9 +-
testing/test_junitxml.py | 4 +-
testing/test_mark.py | 74 ++-
testing/test_monkeypatch.py | 3 +-
testing/test_nose.py | 10 +
testing/test_parseopt.py | 29 +-
testing/test_pastebin.py | 7 +-
testing/test_pdb.py | 16 +-
testing/test_pluginmanager.py | 12 +-
testing/test_pytester.py | 4 +
testing/test_recwarn.py | 35 +-
testing/test_resultlog.py | 20 +-
testing/test_runner.py | 137 ++++--
testing/test_runner_xunit.py | 14 +-
testing/test_session.py | 24 +-
testing/test_skipping.py | 29 +-
testing/test_terminal.py | 72 ++-
testing/test_tmpdir.py | 5 +
testing/test_unittest.py | 144 +++---
testing/test_warnings.py | 39 +-
tox.ini | 223 +++++----
128 files changed, 4359 insertions(+), 2480 deletions(-)
diff --cc debian/.git-dpm
index d5701b8,0000000..05690d0
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
- 6dd73896a4002b088d27c5070b541c1ffa5fae93
- 6dd73896a4002b088d27c5070b541c1ffa5fae93
- aa68af9c74fc9fd8cfd4f41b0fb62518b564bad6
++35d32e76eea2b787d44c81d14ae32db32d225d95
++35d32e76eea2b787d44c81d14ae32db32d225d95
++a287af18dc26f9dac41517ef7d2a7f754eb6331f
+a287af18dc26f9dac41517ef7d2a7f754eb6331f
+pytest_3.2.0.orig.tar.gz
+5244a4ba897d0bd565cd4423cbb575eb0f9954d5
+782232
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Skip-test-under-PyPy.patch
index 69b9fc1,0000000..447f7a8
mode 100644,000000..100644
--- a/debian/patches/0003-Skip-test-under-PyPy.patch
+++ b/debian/patches/0003-Skip-test-under-PyPy.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 6dd73896a4002b088d27c5070b541c1ffa5fae93 Mon Sep 17 00:00:00 2001
++From 35d32e76eea2b787d44c81d14ae32db32d225d95 Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Thu, 13 Jul 2017 13:44:54 +0200
+Subject: Skip test under PyPy
+
+---
+ testing/test_warnings.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/test_warnings.py b/testing/test_warnings.py
- index 69bda11..9e23be8 100644
++index 1328cc3..56dec1c 100644
+--- a/testing/test_warnings.py
++++ b/testing/test_warnings.py
- @@ -138,7 +138,7 @@ def test_unicode(testdir, pyfile_with_warnings):
++@@ -141,7 +141,7 @@ def test_unicode(testdir, pyfile_with_warnings):
+ ])
+
+
+- at pytest.mark.skipif(sys.version_info >= (3, 0),
++ at pytest.mark.skipif(sys.version_info >= (3, 0) or '__pypy__' in sys.builtin_module_names,
+ reason='warnings message is broken as it is not str instance')
+ def test_py2_unicode(testdir, pyfile_with_warnings):
+ testdir.makepyfile('''
diff --cc debian/patches/intersphinx.patch
index d670ee4,0000000..901c4ae
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From ef855b8a3fef9d9c798ac7bd787e0987edfdbbe6 Mon Sep 17 00:00:00 2001
++From b3b9b9d66e9becae1344ba0d11854ac8a5bac457 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 5a5880f,0000000..a3b2166
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 13dcbddfb05360c79d348925d8ec5b705b7ede96 Mon Sep 17 00:00:00 2001
++From 37d06864c95125757a255d65607bbc613be162cb 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