[Python-modules-commits] [pytest] 05/06: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Sun Aug 21 13:25:23 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 bb9c206542fe7fef5f32f1d197a310baedd531f1
Merge: d177cec a0bc8e3
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date: Sun Aug 21 15:11:44 2016 +0200
merge patched into master
AUTHORS | 53 +-
CHANGELOG.rst | 443 ++++-
CONTRIBUTING.rst | 70 +-
PKG-INFO | 36 +-
README.rst | 33 +-
_pytest/__init__.py | 2 +-
_pytest/_code/__init__.py | 3 -
_pytest/_code/code.py | 159 +-
_pytest/assertion/__init__.py | 138 +-
_pytest/assertion/reinterpret.py | 407 -----
_pytest/assertion/rewrite.py | 106 +-
_pytest/assertion/util.py | 38 +-
_pytest/capture.py | 33 +-
_pytest/compat.py | 216 +++
_pytest/config.py | 238 ++-
_pytest/{pdb.py => debugging.py} | 25 +-
_pytest/deprecated.py | 24 +
_pytest/doctest.py | 69 +-
_pytest/fixtures.py | 1110 ++++++++++++
_pytest/freeze_support.py | 45 +
_pytest/genscript.py | 132 --
_pytest/helpconfig.py | 9 +-
_pytest/hookspec.py | 23 +-
_pytest/junitxml.py | 36 +-
_pytest/main.py | 115 +-
_pytest/monkeypatch.py | 20 +-
_pytest/pytester.py | 84 +-
_pytest/python.py | 1788 ++++++--------------
_pytest/resultlog.py | 5 +-
_pytest/runner.py | 55 +-
_pytest/setuponly.py | 72 +
_pytest/setupplan.py | 23 +
_pytest/skipping.py | 32 +-
_pytest/standalonetemplate.py | 89 -
_pytest/terminal.py | 44 +-
_pytest/tmpdir.py | 6 +-
_pytest/unittest.py | 2 +
debian/.git-dpm | 6 +-
debian/patches/drop-entrypoint-logic.patch | 55 -
debian/patches/intersphinx.patch | 2 +-
debian/patches/remove_google_js | 6 +-
debian/patches/series | 1 -
doc/en/_templates/layout.html | 14 -
doc/en/_templates/links.html | 5 -
doc/en/announce/index.rst | 2 +-
doc/en/announce/release-2.9.2.rst | 2 +-
doc/en/announce/release-3.0.0.rst | 82 +
doc/en/announce/sprint2016.rst | 77 +-
doc/en/assert.rst | 40 +-
doc/en/backwards-compatibility.rst | 12 +
doc/en/bash-completion.rst | 4 +-
doc/en/builtin.rst | 29 +-
doc/en/cache.rst | 50 +-
doc/en/capture.rst | 27 +-
doc/en/contents.rst | 4 +-
doc/en/customize.rst | 50 +-
doc/en/doctest.rst | 62 +-
doc/en/example/costlysetup/conftest.py | 4 +-
doc/en/example/markers.rst | 84 +-
doc/en/example/multipython.py | 2 +-
doc/en/example/nonpython.rst | 18 +-
doc/en/example/nonpython/conftest.py | 4 +-
doc/en/example/parametrize.rst | 42 +-
doc/en/example/pythoncollection.py | 2 +-
doc/en/example/pythoncollection.rst | 63 +-
doc/en/example/reportingdemo.rst | 27 +-
doc/en/example/simple.rst | 159 +-
doc/en/example/special.rst | 2 +-
doc/en/faq.rst | 23 +-
doc/en/fixture.rst | 161 +-
doc/en/funcarg_compare.rst | 10 +-
doc/en/genapi.py | 2 +-
doc/en/getting-started.rst | 59 +-
doc/en/goodpractices.rst | 68 +-
doc/en/index.rst | 6 +-
doc/en/monkeypatch.rst | 35 +-
doc/en/nose.rst | 13 +-
doc/en/parametrize.rst | 19 +-
doc/en/plugins.rst | 7 +-
doc/en/proposals/parametrize_with_fixtures.rst | 148 ++
doc/en/skipping.rst | 8 +-
doc/en/talks.rst | 41 +-
doc/en/test/attic.rst | 2 +-
doc/en/test/mission.rst | 2 +-
doc/en/test/plugin/cov.rst | 14 +-
doc/en/test/plugin/coverage.rst | 2 +-
doc/en/test/plugin/figleaf.rst | 2 +-
doc/en/test/plugin/genscript.rst | 28 -
doc/en/test/plugin/helpconfig.rst | 2 -
doc/en/test/plugin/links.rst | 2 -
doc/en/test/plugin/nose.rst | 4 +-
doc/en/test/plugin/terminal.rst | 2 -
doc/en/test/plugin/xdist.rst | 10 +-
doc/en/tmpdir.rst | 6 +-
doc/en/unittest.rst | 8 +-
doc/en/usage.rst | 121 +-
doc/en/writing_plugins.rst | 79 +-
doc/en/xdist.rst | 20 +-
doc/en/xunit_setup.rst | 37 +-
doc/en/yieldfixture.rst | 102 +-
plugin-test.sh | 14 +-
pytest.egg-info/PKG-INFO | 36 +-
pytest.egg-info/SOURCES.txt | 37 +-
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/requires.txt | 4 +-
pytest.egg-info/top_level.txt | 2 +-
setup.cfg | 2 +-
setup.py | 11 +-
testing/acceptance_test.py | 93 +-
testing/code/test_code.py | 18 -
testing/code/test_excinfo.py | 325 +++-
testing/code/test_source.py | 14 +-
testing/cx_freeze/install_cx_freeze.py | 64 -
testing/cx_freeze/runtests_setup.py | 15 -
testing/cx_freeze/tox_run.py | 15 -
testing/deprecated_test.py | 76 +
testing/freeze/.gitignore | 3 +
testing/freeze/create_executable.py | 13 +
testing/{cx_freeze => freeze}/runtests_script.py | 16 +-
.../{cx_freeze => freeze}/tests/test_doctest.txt | 0
.../{cx_freeze => freeze}/tests/test_trivial.py | 10 +-
testing/freeze/tox_run.py | 12 +
testing/python/approx.py | 286 ++++
testing/python/collect.py | 89 +-
testing/python/fixture.py | 482 ++++--
testing/python/integration.py | 13 +-
testing/python/metafunc.py | 249 ++-
testing/python/raises.py | 20 +
testing/python/setup_only.py | 243 +++
testing/python/setup_plan.py | 19 +
testing/python/show_fixtures_per_test.py | 137 ++
testing/test_assertinterpret.py | 274 ---
testing/test_assertion.py | 244 ++-
testing/test_assertrewrite.py | 79 +-
testing/test_capture.py | 39 +-
testing/test_collection.py | 126 +-
testing/test_config.py | 212 ++-
testing/test_conftest.py | 14 +
testing/test_doctest.py | 161 +-
testing/test_entry_points.py | 13 +
testing/test_genscript.py | 51 -
testing/test_helpconfig.py | 4 +-
testing/test_junitxml.py | 172 +-
testing/test_mark.py | 53 +-
testing/test_monkeypatch.py | 11 +-
testing/test_parseopt.py | 23 +-
testing/test_pdb.py | 34 +-
testing/test_resultlog.py | 11 +-
testing/test_runner.py | 127 +-
testing/test_runner_xunit.py | 55 +-
testing/test_session.py | 18 +-
testing/test_skipping.py | 52 +-
testing/test_terminal.py | 55 +-
testing/test_tmpdir.py | 1 -
testing/test_unittest.py | 86 +-
tox.ini | 45 +-
156 files changed, 7722 insertions(+), 4321 deletions(-)
diff --cc debian/.git-dpm
index 57fc171,0000000..7525bad
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
- 0542b7c2618956eb202a15c68edba7f2fedbb6b4
- 0542b7c2618956eb202a15c68edba7f2fedbb6b4
- 25454da31503990848b614982e8b2d43ec96beac
++a0bc8e33f115ff84080616b2d2cd9c77307db384
++a0bc8e33f115ff84080616b2d2cd9c77307db384
++da7f16ca4c4318e92778537ac8f1fd0f40486bf8
+da7f16ca4c4318e92778537ac8f1fd0f40486bf8
+pytest_3.0.0.orig.tar.gz
+09f3942a596c8fabaadc5fffa9be25a3604a79d1
+728820
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index be9d052,0000000..29724b5
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 0542b7c2618956eb202a15c68edba7f2fedbb6b4 Mon Sep 17 00:00:00 2001
++From a0bc8e33f115ff84080616b2d2cd9c77307db384 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 aca0442..f0eab9c 100644
+--- a/doc/en/conf.py
++++ b/doc/en/conf.py
+@@ -312,11 +312,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 9a61de7,0000000..0182d26
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 800982325cd2f744bfef4b15b9e2cd3e475cf35a Mon Sep 17 00:00:00 2001
++From 54759d5c44c12e07866979e07f1419d51e690455 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 0ce480b..580070b 100644
++index 2fc8e2a..3e30439 100644
+--- a/doc/en/_templates/layout.html
++++ b/doc/en/_templates/layout.html
- @@ -18,17 +18,4 @@
++@@ -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 %}
diff --cc debian/patches/series
index 49cd64a,0000000..30a1f91
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+remove_google_js
- drop-entrypoint-logic.patch
+intersphinx.patch
--
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