[Python-modules-commits] [pytest] 04/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 6fa4c00be64f19b359b60cd4bd31f36a8d49ce6b
Merge: 1ca2f82 9a4c872
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 13:36:05 2016 -0500

    merge patched into master

 debian/.git-dpm                             |  4 ++--
 debian/patches/normalize-entry-points.patch | 12 +++++++-----
 setup.py                                    |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index b8bda7a,0000000..8d764b1
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
- b785d57d18ca439f71c8780f11c9c2a1deef06dc
- b785d57d18ca439f71c8780f11c9c2a1deef06dc
++9a4c8726a5527180f1c0a1fea254af01955b70f3
++9a4c8726a5527180f1c0a1fea254af01955b70f3
 +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 8a4bd84,0000000..57f8fcd
mode 100644,000000..100644
--- a/debian/patches/normalize-entry-points.patch
+++ b/debian/patches/normalize-entry-points.patch
@@@ -1,24 -1,0 +1,26 @@@
- From b785d57d18ca439f71c8780f11c9c2a1deef06dc Mon Sep 17 00:00:00 2001
++From 9a4c8726a5527180f1c0a1fea254af01955b70f3 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 | 3 ++-
-  1 file changed, 2 insertions(+), 1 deletion(-)
++ setup.py | 5 ++++-
++ 1 file changed, 4 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index ec9c9d4..dc054d2 100644
++index ec9c9d4..7d0d779 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -89,7 +89,8 @@ def cmdline_entrypoints(versioninfo, platform, basename):
++@@ -89,7 +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-3' : target}
+++            else:
+++                points = {}
 +         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