[med-svn] [snakemake] 08/09: Rather than using copy of old version use what we get inside the release as the executable for testing

[Andreas Tille]

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

tille pushed a commit to tag debian/3.9.1-1
in repository snakemake.

commit 07179f546aa155348dac399a5fd42f99d3f34ad8
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 9 17:54:16 2017 +0100

    Rather than using copy of old version use what we get inside the release as the executable for testing
---
 debian/patches/0006-restore-bin.patch | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0006-restore-bin.patch b/debian/patches/0006-restore-bin.patch
index 98cc474..eac0e93 100644
--- a/debian/patches/0006-restore-bin.patch
+++ b/debian/patches/0006-restore-bin.patch
@@ -1,28 +1,20 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Mon, 09 Jan 2017 14:39:07 +0100
-Description: Version 3.9.1 is lacking snakemake executable - using copy
- from 3.9.0 created via this quilt patch
+Description: Version 3.9.1 is lacking snakemake executable - using the
+ binary that results from build process as quilt patch at the former location
 
 --- /dev/null
 +++ b/bin/snakemake
-@@ -0,0 +1,20 @@
-+#!/usr/bin/env python3
-+# -*- coding: utf-8 -*-
-+
-+import os
+@@ -0,0 +1,12 @@
++#!/usr/bin/python3
++# EASY-INSTALL-ENTRY-SCRIPT: 'snakemake==3.9.1','console_scripts','snakemake'
++__requires__ = 'snakemake==3.9.1'
++import re
 +import sys
++from pkg_resources import load_entry_point
 +
-+__author__ = "Johannes Köster"
-+
-+# If running from within source directory,
-+# add '../snakemake' to sys.path.
-+_libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../')
-+if os.path.isfile(os.path.join(_libdir, 'snakemake', '__init__.py')):
-+    sys.path.insert(0, _libdir)
-+
-+from snakemake import main
-+
-+if __name__ == "__main__":
-+    #import cProfile
-+    #cProfile.run('main()', "snakemake.profile")
-+    main()
++if __name__ == '__main__':
++    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
++    sys.exit(
++        load_entry_point('snakemake==3.9.1', 'console_scripts', 'snakemake')()
++    )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/snakemake.git