[Python-modules-commits] [pytest] 05/09: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Mon Mar 21 12:59:32 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 cf0a37b761578a5ac44267ae0c01ae6d9d33fb51
Merge: 3df6e25 943344e
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date: Mon Mar 21 13:48:44 2016 +0100
merge patched into master
AUTHORS | 10 +
CHANGELOG => CHANGELOG.rst | 391 +++++++++----
CONTRIBUTING.rst | 142 +++--
LICENSE | 36 +-
MANIFEST.in | 2 +-
PKG-INFO | 9 +-
README.rst | 7 +-
_pytest/__init__.py | 2 +-
_pytest/_argcomplete.py | 3 -
_pytest/_code/__init__.py | 12 +
_pytest/_code/_py2traceback.py | 81 +++
_pytest/_code/code.py | 795 +++++++++++++++++++++++++
_pytest/_code/source.py | 421 +++++++++++++
_pytest/assertion/__init__.py | 13 +-
_pytest/assertion/newinterpret.py | 365 ------------
_pytest/assertion/oldinterpret.py | 566 ------------------
_pytest/assertion/reinterpret.py | 369 +++++++++++-
_pytest/assertion/rewrite.py | 5 +
_pytest/assertion/util.py | 21 +-
_pytest/cacheprovider.py | 8 +-
_pytest/config.py | 73 ++-
_pytest/doctest.py | 84 ++-
_pytest/hookspec.py | 22 +-
_pytest/junitxml.py | 29 +-
_pytest/main.py | 15 +-
_pytest/mark.py | 2 +-
_pytest/pdb.py | 3 +-
_pytest/pytester.py | 23 +-
_pytest/python.py | 79 +--
_pytest/recwarn.py | 16 +-
_pytest/runner.py | 18 +-
_pytest/skipping.py | 65 +-
_pytest/terminal.py | 24 +-
_pytest/unittest.py | 11 +-
debian/.git-dpm | 6 +-
debian/patches/drop-entrypoint-logic.patch | 4 +-
debian/patches/remove_google_js | 8 +-
doc/en/_templates/globaltoc.html | 1 +
doc/en/_templates/layout.html | 16 +
doc/en/_templates/links.html | 5 +
doc/en/announce/index.rst | 3 +
doc/en/announce/release-2.9.0.rst | 159 +++++
doc/en/announce/release-2.9.1.rst | 65 ++
doc/en/announce/sprint2016.rst | 105 ++++
doc/en/assert.rst | 16 +-
doc/en/cache.rst | 12 +-
doc/en/capture.rst | 2 +-
doc/en/changelog.rst | 2 +-
doc/en/contents.rst | 7 +-
doc/en/doctest.rst | 34 +-
doc/en/example/assertion/failure_demo.py | 3 +-
doc/en/example/markers.rst | 32 +-
doc/en/example/multipython.py | 5 +-
doc/en/example/nonpython.rst | 6 +-
doc/en/example/parametrize.rst | 19 +-
doc/en/example/pythoncollection.rst | 6 +-
doc/en/example/reportingdemo.rst | 102 ++--
doc/en/example/simple.rst | 28 +-
doc/en/faq.rst | 5 +-
doc/en/fixture.rst | 10 +-
doc/en/getting-started.rst | 4 +-
doc/en/img/freiburg2.jpg | Bin 0 -> 104057 bytes
doc/en/index.rst | 1 +
doc/en/license.rst | 32 +
doc/en/parametrize.rst | 8 +-
doc/en/recwarn.rst | 6 +
doc/en/skipping.rst | 153 +++--
doc/en/talks.rst | 5 +-
doc/en/test/plugin/xdist.rst | 4 +-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 2 +-
doc/en/usage.rst | 12 +-
doc/en/writing_plugins.rst | 4 +-
doc/en/xdist.rst | 10 +-
pytest.egg-info/PKG-INFO | 9 +-
pytest.egg-info/SOURCES.txt | 16 +-
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/requires.txt | 6 +-
setup.py | 2 +-
testing/acceptance_test.py | 24 +-
testing/code/test_code.py | 174 ++++++
testing/code/test_excinfo.py | 911 +++++++++++++++++++++++++++++
testing/code/test_source.py | 659 +++++++++++++++++++++
testing/python/collect.py | 117 +++-
testing/python/fixture.py | 32 +-
testing/python/integration.py | 3 +-
testing/python/metafunc.py | 13 +-
testing/python/raises.py | 9 +-
testing/test_argcomplete.py | 4 -
testing/test_assertinterpret.py | 83 +--
testing/test_assertion.py | 27 +-
testing/test_assertrewrite.py | 20 +-
testing/test_cache.py | 43 +-
testing/test_capture.py | 5 +-
testing/test_config.py | 83 ++-
testing/test_conftest.py | 17 +-
testing/test_doctest.py | 85 ++-
testing/test_junitxml.py | 56 +-
testing/test_mark.py | 18 +-
testing/test_nose.py | 1 -
testing/test_parseopt.py | 6 -
testing/test_pdb.py | 13 +-
testing/test_pluginmanager.py | 8 +-
testing/test_recwarn.py | 10 +
testing/test_resultlog.py | 10 +-
testing/test_runner.py | 64 +-
testing/test_skipping.py | 174 +++++-
testing/test_terminal.py | 70 ++-
testing/test_unittest.py | 3 +-
tox.ini | 11 +-
110 files changed, 5676 insertions(+), 1738 deletions(-)
diff --cc debian/.git-dpm
index 5ea8707,0000000..347be78
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
- a4961ab6c4fe36d9009243e1ae69b98fb39ebf58
- a4961ab6c4fe36d9009243e1ae69b98fb39ebf58
- b3de031a07fd5ca0f809f15c736f9aa0016e573c
++943344eabd8fc7262449368ba75011afc0443999
++943344eabd8fc7262449368ba75011afc0443999
++486160d18e6f34e6c9f96456b537ac08f8aba0fc
+486160d18e6f34e6c9f96456b537ac08f8aba0fc
+pytest_2.9.1.orig.tar.gz
+f1c1c9ca02907285a15613cdbea36b7bd9da5e23
+700602
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop-entrypoint-logic.patch
index 34b0cfd,0000000..79a2385
mode 100644,000000..100644
--- a/debian/patches/drop-entrypoint-logic.patch
+++ b/debian/patches/drop-entrypoint-logic.patch
@@@ -1,55 -1,0 +1,55 @@@
- From a4961ab6c4fe36d9009243e1ae69b98fb39ebf58 Mon Sep 17 00:00:00 2001
++From 943344eabd8fc7262449368ba75011afc0443999 Mon Sep 17 00:00:00 2001
+From: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
+Date: Mon, 15 Feb 2016 21:50:17 +0100
+Subject: drop entrypoint logic as it missmatches setup time and wheel install
+ time
+
+Patch-Name: drop-entrypoint-logic.patch
+---
+ setup.py | 26 +++-----------------------
+ 1 file changed, 3 insertions(+), 23 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index ec9c9d4..bf663f6 100644
++index 6660f21..fbbcbc9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -69,7 +69,9 @@ def main():
+ platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
+ author='Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others',
+ author_email='holger at merlinux.eu',
+- entry_points=make_entry_points(),
++ entry_points={
++ 'console_scripts': ['py.test = pytest:main']
++ },
+ classifiers=classifiers,
+ cmdclass={'test': PyTest},
+ # the following should be enabled for release
+@@ -81,28 +83,6 @@ def main():
+ )
+
+
+-def cmdline_entrypoints(versioninfo, platform, basename):
+- target = 'pytest:main'
+- if platform.startswith('java'):
+- points = {'py.test-jython': target}
+- else:
+- if basename.startswith('pypy'):
+- points = {'py.test-%s' % basename: target}
+- else: # cpython
+- points = {'py.test-%s.%s' % versioninfo[:2] : target}
+- points['py.test'] = target
+- return points
+-
+-
+-def make_entry_points():
+- basename = os.path.basename(sys.executable)
+- points = cmdline_entrypoints(sys.version_info, sys.platform, basename)
+- keys = list(points.keys())
+- keys.sort()
+- l = ['%s = %s' % (x, points[x]) for x in keys]
+- return {'console_scripts': l}
+-
+-
+ class PyTest(Command):
+ user_options = []
+ def initialize_options(self):
diff --cc debian/patches/remove_google_js
index 8e79df6,0000000..be74dd3
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 82d23da686d6109b288056ab42dc3b0a88efc476 Mon Sep 17 00:00:00 2001
++From 231f96800a8ecc2898c937a134a98d6e63e622e3 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 5ec94fd..35b0b58 100644
++index 0ce480b..580070b 100644
+--- a/doc/en/_templates/layout.html
++++ b/doc/en/_templates/layout.html
- @@ -2,17 +2,4 @@
-
++@@ -18,17 +18,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