Neels Hofmeyr has submitted this change and it was merged.
Change subject: setup.py: don't install py3 scripts with python2
......................................................................
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
---
M setup.py
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Neels Hofmeyr: Looks good to me, approved; Verified
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",
--
To view, visit https://gerrit.osmocom.org/4312
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84a5c8ec108a99f527b0d2fb5bf4e312df5f7403
Gerrit-PatchSet: 1
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Neels Hofmeyr <[email protected]>
