[Python-modules-commits] [pytest] 07/13: update debian/patches directory

[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 dc7d40da0d46eb31351f600a6edf06fb0d75d912
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 15 21:50:44 2016 +0100

    update debian/patches directory
---
 debian/.git-dpm                            |  2 +-
 debian/patches/drop-entrypoint-logic.patch | 55 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index bdbadda..f5f297d 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
 # see git-dpm(1) from git-dpm package
-82d23da686d6109b288056ab42dc3b0a88efc476
+ffe358a553baea873e09576f67841947909f8237
 ffe358a553baea873e09576f67841947909f8237
 b3de031a07fd5ca0f809f15c736f9aa0016e573c
 b3de031a07fd5ca0f809f15c736f9aa0016e573c
diff --git a/debian/patches/drop-entrypoint-logic.patch b/debian/patches/drop-entrypoint-logic.patch
new file mode 100644
index 0000000..7942fad
--- /dev/null
+++ b/debian/patches/drop-entrypoint-logic.patch
@@ -0,0 +1,55 @@
+From ffe358a553baea873e09576f67841947909f8237 Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sramacher at debian.org>
+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):
diff --git a/debian/patches/series b/debian/patches/series
index 3e352e9..0150aca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_google_js
+drop-entrypoint-logic.patch

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