From 4e8d6eec5cef0fdba861ba6d29ee59b09631c296 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 17 Oct 2017 04:02:31 +0200 Subject: setup.py: don't install py3 scripts with python2 If one calls 'python2 setup.py install', python replaces the script shebangs with python2 ones, regardless of the code being mint python3, and vice versa. In setup.py, name only the scripts that match the current python version. Change-Id: I84a5c8ec108a99f527b0d2fb5bf4e312df5f7403 --- setup.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 9c25a0d..ec8654a 100755 --- a/setup.py +++ b/setup.py @@ -17,15 +17,20 @@ from distutils.core import setup from osmopy import __version__ +import sys + +if sys.version_info.major == 2: + scripts = ["osmopy/osmodumpdoc.py", "osmopy/osmotestconfig.py", + "osmopy/osmotestvty.py"] +elif sys.version_info.major == 3: + scripts = ["osmopy/osmo_verify_transcript_vty.py", + "osmopy/osmo_verify_transcript_ctrl.py"] setup( name = 'osmopython', version = __version__, packages = ["osmopy"], - scripts = ["osmopy/osmodumpdoc.py", "osmopy/osmotestconfig.py", - "osmopy/osmotestvty.py", - "osmopy/osmo_verify_transcript_vty.py", - "osmopy/osmo_verify_transcript_ctrl.py"], + scripts = scripts, license = "AGPLv3", description = "Osmopython: osmocom testing scripts", author = "Katerina Barone-Adesi", -- cgit v1.2.3