Review at https://gerrit.osmocom.org/5278
Move scripts to appropriate directory
Having the scripts in the same directory with library code means that
it'll be installed unconditionally regardless of version check in
setup.py which makes it impossible to write proper version-specific
tests. Fix this by moving the scripts into separate directory and
adjusting init and setup files accordingly.
This is necessary for implementing proper CI tests in follow-up patches.
Change-Id: I30cdf0f85b2a60a235960911c9827f4129da40db
---
M osmopy/__init__.py
R scripts/osmo_interact_common.py
R scripts/osmo_interact_ctrl.py
R scripts/osmo_interact_vty.py
R scripts/osmo_verify_transcript_ctrl.py
R scripts/osmo_verify_transcript_vty.py
R scripts/osmodumpdoc.py
R scripts/osmotestconfig.py
R scripts/osmotestvty.py
R scripts/soap.py
R scripts/twisted_ipa.py
M setup.py
12 files changed, 10 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests
refs/changes/78/5278/1
diff --git a/osmopy/__init__.py b/osmopy/__init__.py
index b760111..20a21c9 100644
--- a/osmopy/__init__.py
+++ b/osmopy/__init__.py
@@ -1,14 +1,4 @@
#!/usr/bin/env python
-__version__ = '0.0.2'
+__version__ = '0.0.3'
-__all__ = ['obscvty', 'osmodumpdoc', 'osmotestconfig', 'osmotestvty',
- 'osmoutil',
- 'osmo_ipa',
- 'osmo_ctrl',
- 'soap',
- 'twisted_ipa',
- 'osmo_interact_common',
- 'osmo_interact_vty',
- 'osmo_interact_ctrl',
- 'osmo_verify_transcript_vty',
- 'osmo_verify_transcript_ctrl']
+__all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_ctrl']
diff --git a/osmopy/osmo_interact_common.py b/scripts/osmo_interact_common.py
similarity index 100%
rename from osmopy/osmo_interact_common.py
rename to scripts/osmo_interact_common.py
diff --git a/osmopy/osmo_interact_ctrl.py b/scripts/osmo_interact_ctrl.py
similarity index 100%
rename from osmopy/osmo_interact_ctrl.py
rename to scripts/osmo_interact_ctrl.py
diff --git a/osmopy/osmo_interact_vty.py b/scripts/osmo_interact_vty.py
similarity index 100%
rename from osmopy/osmo_interact_vty.py
rename to scripts/osmo_interact_vty.py
diff --git a/osmopy/osmo_verify_transcript_ctrl.py
b/scripts/osmo_verify_transcript_ctrl.py
similarity index 100%
rename from osmopy/osmo_verify_transcript_ctrl.py
rename to scripts/osmo_verify_transcript_ctrl.py
diff --git a/osmopy/osmo_verify_transcript_vty.py
b/scripts/osmo_verify_transcript_vty.py
similarity index 100%
rename from osmopy/osmo_verify_transcript_vty.py
rename to scripts/osmo_verify_transcript_vty.py
diff --git a/osmopy/osmodumpdoc.py b/scripts/osmodumpdoc.py
similarity index 100%
rename from osmopy/osmodumpdoc.py
rename to scripts/osmodumpdoc.py
diff --git a/osmopy/osmotestconfig.py b/scripts/osmotestconfig.py
similarity index 100%
rename from osmopy/osmotestconfig.py
rename to scripts/osmotestconfig.py
diff --git a/osmopy/osmotestvty.py b/scripts/osmotestvty.py
similarity index 100%
rename from osmopy/osmotestvty.py
rename to scripts/osmotestvty.py
diff --git a/osmopy/soap.py b/scripts/soap.py
similarity index 100%
rename from osmopy/soap.py
rename to scripts/soap.py
diff --git a/osmopy/twisted_ipa.py b/scripts/twisted_ipa.py
similarity index 100%
rename from osmopy/twisted_ipa.py
rename to scripts/twisted_ipa.py
diff --git a/setup.py b/setup.py
index 3e147c4..76886ae 100755
--- a/setup.py
+++ b/setup.py
@@ -20,17 +20,15 @@
import sys
if sys.version_info.major == 2:
- scripts = ["osmopy/osmodumpdoc.py", "osmopy/osmotestconfig.py",
- "osmopy/osmotestvty.py"]
+ scripts = ["scripts/osmodumpdoc.py", "scripts/osmotestconfig.py",
+ "scripts/osmotestvty.py"]
elif sys.version_info.major == 3:
- scripts = ["osmopy/osmo_interact_vty.py",
- "osmopy/osmo_interact_ctrl.py",
- "osmopy/soap.py",
- "osmopy/osmo_ctrl.py",
- "osmopy/osmo_ipa.py",
- "osmopy/twisted_ipa.py",
- "osmopy/osmo_verify_transcript_vty.py",
- "osmopy/osmo_verify_transcript_ctrl.py"]
+ scripts = ["scripts/osmo_interact_vty.py",
+ "scripts/osmo_interact_ctrl.py",
+ "scripts/soap.py",
+ "scripts/twisted_ipa.py",
+ "scripts/osmo_verify_transcript_vty.py",
+ "scripts/osmo_verify_transcript_ctrl.py"]
setup(
name = 'osmopython',
--
To view, visit https://gerrit.osmocom.org/5278
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30cdf0f85b2a60a235960911c9827f4129da40db
Gerrit-PatchSet: 1
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Owner: Max <msur...@sysmocom.de>
