[Python-modules-commits] [pytest] 06/12: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository pytest.

commit de008305cc63780c6031108e766fddc33887e2d6
Merge: 6fa4c00 00fc4b7
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 13:43:23 2016 -0500

    merge patched into master

 debian/.git-dpm                             |  4 ++--
 debian/patches/normalize-entry-points.patch | 17 +++++++++--------
 setup.py                                    |  5 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 8d764b1,0000000..b75e706
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
- 9a4c8726a5527180f1c0a1fea254af01955b70f3
- 9a4c8726a5527180f1c0a1fea254af01955b70f3
++00fc4b7079f17bf98a3e83c28f8247704f3244a0
++00fc4b7079f17bf98a3e83c28f8247704f3244a0
 +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/normalize-entry-points.patch
index 57f8fcd,0000000..9e32d29
mode 100644,000000..100644
--- a/debian/patches/normalize-entry-points.patch
+++ b/debian/patches/normalize-entry-points.patch
@@@ -1,26 -1,0 +1,27 @@@
- From 9a4c8726a5527180f1c0a1fea254af01955b70f3 Mon Sep 17 00:00:00 2001
++From 00fc4b7079f17bf98a3e83c28f8247704f3244a0 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Thu, 11 Feb 2016 13:31:23 -0500
 +Subject: Don't provide py.test-X.Y entry points.
 +
 +Patch-Name: normalize-entry-points.patch
 +---
-  setup.py | 5 ++++-
-  1 file changed, 4 insertions(+), 1 deletion(-)
++ setup.py | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index ec9c9d4..7d0d779 100644
++index ec9c9d4..d969a23 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -89,7 +89,10 @@ def cmdline_entrypoints(versioninfo, platform, basename):
++@@ -89,8 +89,10 @@ def cmdline_entrypoints(versioninfo, platform, basename):
 +         if basename.startswith('pypy'):
 +             points = {'py.test-%s' % basename: target}
 +         else: # cpython
 +-            points = {'py.test-%s.%s' % versioninfo[:2] : target}
- +            if versioninfo[0] == '3':
++-        points['py.test'] = target
+++            if versioninfo.major == 3:
 ++                points = {'py.test-3' : target}
 ++            else:
- +                points = {}
-          points['py.test'] = target
+++                points = {'py.test' : target}
 +     return points
 + 
++ 

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