[Python-modules-commits] [pytest] 02/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 1ca2f827ebf358dc0d8aa74d561ee42a02d93d6b
Merge: 79a244a b785d57
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 13:31:57 2016 -0500

    merge patched into master

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

diff --cc debian/.git-dpm
index 676e3a7,0000000..b8bda7a
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
- 82d23da686d6109b288056ab42dc3b0a88efc476
- 82d23da686d6109b288056ab42dc3b0a88efc476
++b785d57d18ca439f71c8780f11c9c2a1deef06dc
++b785d57d18ca439f71c8780f11c9c2a1deef06dc
 +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 0000000,0000000..8a4bd84
new file mode 100644
--- /dev/null
+++ b/debian/patches/normalize-entry-points.patch
@@@ -1,0 -1,0 +1,24 @@@
++From b785d57d18ca439f71c8780f11c9c2a1deef06dc 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(-)
++
++diff --git a/setup.py b/setup.py
++index ec9c9d4..dc054d2 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -89,7 +89,8 @@ 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}
++         points['py.test'] = target
++     return points
++ 
diff --cc debian/patches/series
index 3e352e9,0000000..dc0d639
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +remove_google_js
++normalize-entry-points.patch

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