[Python-modules-commits] [pytest] 08/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 487a2326ef2c253c947cc5e404f7fd50f8d4119b
Merge: de00830 1417fe9
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 13:53:51 2016 -0500

    merge patched into master

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

diff --cc debian/.git-dpm
index b75e706,0000000..b53a361
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
- 00fc4b7079f17bf98a3e83c28f8247704f3244a0
- 00fc4b7079f17bf98a3e83c28f8247704f3244a0
++1417fe9516de97264b93382eab56b85540ff2fdd
++1417fe9516de97264b93382eab56b85540ff2fdd
 +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 9e32d29,0000000..4e0f30e
mode 100644,000000..100644
--- a/debian/patches/normalize-entry-points.patch
+++ b/debian/patches/normalize-entry-points.patch
@@@ -1,27 -1,0 +1,25 @@@
- From 00fc4b7079f17bf98a3e83c28f8247704f3244a0 Mon Sep 17 00:00:00 2001
++From 1417fe9516de97264b93382eab56b85540ff2fdd 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 | 6 ++++--
-  1 file changed, 4 insertions(+), 2 deletions(-)
++ setup.py | 4 ++++
++ 1 file changed, 4 insertions(+)
 +
 +diff --git a/setup.py b/setup.py
- index ec9c9d4..d969a23 100644
++index ec9c9d4..bb2712e 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -89,8 +89,10 @@ def cmdline_entrypoints(versioninfo, platform, basename):
-          if basename.startswith('pypy'):
-              points = {'py.test-%s' % basename: target}
++@@ -91,6 +91,10 @@ def cmdline_entrypoints(versioninfo, platform, basename):
 +         else: # cpython
- -            points = {'py.test-%s.%s' % versioninfo[:2] : target}
- -        points['py.test'] = target
- +            if versioninfo.major == 3:
- +                points = {'py.test-3' : target}
- +            else:
- +                points = {'py.test' : target}
++             points = {'py.test-%s.%s' % versioninfo[:2] : target}
++         points['py.test'] = target
+++            ## if versioninfo.major == 3:
+++            ##     points = {'py.test-3' : target}
+++            ## else:
+++            ##     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