[Python-modules-commits] [pytest] 09/13: merge patched into master

[Sebastian Ramacher]

This is an automated email from the git hooks/post-receive script.

sramacher pushed a commit to branch master
in repository pytest.

commit 316da09cc8565b952e7904361176ce08d39933c1
Merge: dc7d40d a4961ab
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 15 21:52:47 2016 +0100

    merge patched into master

 debian/.git-dpm                            | 4 ++--
 debian/patches/drop-entrypoint-logic.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index f5f297d,0000000..1a497c4
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
- ffe358a553baea873e09576f67841947909f8237
- ffe358a553baea873e09576f67841947909f8237
++a4961ab6c4fe36d9009243e1ae69b98fb39ebf58
++a4961ab6c4fe36d9009243e1ae69b98fb39ebf58
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +pytest_2.8.7.orig.tar.gz
 +58474cc27e8737ddde907b8d7b9917fc88493b1f
 +564943
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop-entrypoint-logic.patch
index 7942fad,0000000..34b0cfd
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 ffe358a553baea873e09576f67841947909f8237 Mon Sep 17 00:00:00 2001
- From: Sebastian Ramacher <sramacher at debian.org>
++From a4961ab6c4fe36d9009243e1ae69b98fb39ebf58 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
 +--- 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):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest.git