[Python-modules-commits] [pytest] 05/09: merge patched into master
Sebastian Ramacher
sramacher at moszumanska.debian.org
Thu Jun 2 20:03:54 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 4d222a3b1186b8d97505a8aa0377f832b62fd781
Merge: f48fd1b fbb23c4
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Jun 2 21:28:59 2016 +0200
merge patched into master
AUTHORS | 4 ++
CHANGELOG.rst | 67 +++++++++++++++----
PKG-INFO | 2 +-
_pytest/__init__.py | 2 +-
_pytest/_code/code.py | 22 ++++--
_pytest/cacheprovider.py | 0
_pytest/config.py | 2 +-
_pytest/genscript.py | 0
_pytest/junitxml.py | 2 +-
_pytest/mark.py | 2 +-
_pytest/python.py | 34 +++++-----
_pytest/skipping.py | 23 ++++---
_pytest/standalonetemplate.py | 0
debian/.git-dpm | 6 +-
debian/patches/drop-entrypoint-logic.patch | 4 +-
debian/patches/remove_google_js | 2 +-
doc/en/_getdoctarget.py | 0
doc/en/announce/index.rst | 3 +-
doc/en/announce/release-2.9.0.rst | 4 +-
doc/en/announce/release-2.9.2.rst | 73 ++++++++++++++++++++
doc/en/assert.rst | 6 +-
doc/en/bash-completion.rst | 2 +-
doc/en/cache.rst | 6 +-
doc/en/capture.rst | 2 +-
doc/en/doctest.rst | 2 +-
doc/en/example/markers.rst | 36 +++++-----
doc/en/example/nonpython.rst | 12 ++--
doc/en/example/parametrize.rst | 19 +++---
doc/en/example/pythoncollection.rst | 52 +++++++++------
doc/en/example/reportingdemo.rst | 10 +--
doc/en/example/simple.rst | 30 ++++-----
doc/en/fixture.rst | 103 ++++++++++++++++++++---------
doc/en/getting-started.rst | 4 +-
doc/en/goodpractices.rst | 4 +-
doc/en/links.inc | 4 +-
doc/en/nose.rst | 2 +-
doc/en/parametrize.rst | 6 +-
doc/en/plugins.rst | 2 +-
doc/en/projects.rst | 2 +-
doc/en/skipping.rst | 2 +-
doc/en/test/attic.rst | 2 +-
doc/en/test/plugin/helpconfig.rst | 2 +-
doc/en/test/plugin/terminal.rst | 2 +-
doc/en/tmpdir.rst | 2 +-
doc/en/unittest.rst | 2 +-
doc/en/usage.rst | 12 +++-
doc/en/writing_plugins.rst | 15 ++++-
extra/get_issues.py | 70 +++++++++++---------
pytest.egg-info/PKG-INFO | 2 +-
pytest.egg-info/SOURCES.txt | 1 +
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/requires.txt | 6 +-
setup.py | 2 +-
testing/acceptance_test.py | 5 ++
testing/code/test_excinfo.py | 18 ++++-
testing/python/fixture.py | 32 +++++++++
testing/python/metafunc.py | 7 ++
testing/test_cache.py | 0
testing/test_config.py | 12 +++-
testing/test_junitxml.py | 8 +--
testing/test_skipping.py | 28 +++++++-
tox.ini | 7 +-
62 files changed, 552 insertions(+), 243 deletions(-)
diff --cc debian/.git-dpm
index 103bd34,0000000..9d591e0
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
- 943344eabd8fc7262449368ba75011afc0443999
- 943344eabd8fc7262449368ba75011afc0443999
- 486160d18e6f34e6c9f96456b537ac08f8aba0fc
++fbb23c4df1493b8ded70386e5ced1ab76e12c198
++fbb23c4df1493b8ded70386e5ced1ab76e12c198
++25454da31503990848b614982e8b2d43ec96beac
+25454da31503990848b614982e8b2d43ec96beac
+pytest_2.9.2.orig.tar.gz
+586675a7ce39cd33e16b34cc539240b38c10d5e8
+700808
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop-entrypoint-logic.patch
index 79a2385,0000000..7f7b222
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 943344eabd8fc7262449368ba75011afc0443999 Mon Sep 17 00:00:00 2001
++From fbb23c4df1493b8ded70386e5ced1ab76e12c198 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 6660f21..fbbcbc9 100644
++index 7cdcdfb..8ba08da 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 be74dd3,0000000..9a61de7
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
+++ b/debian/patches/remove_google_js
@@@ -1,35 -1,0 +1,35 @@@
- From 231f96800a8ecc2898c937a134a98d6e63e622e3 Mon Sep 17 00:00:00 2001
++From 800982325cd2f744bfef4b15b9e2cd3e475cf35a 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
+--- a/doc/en/_templates/layout.html
++++ b/doc/en/_templates/layout.html
+@@ -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