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 separate tests for python 2
and 3. 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

13 files changed, 10 insertions, 22 deletions

diff --git a/osmopy/__init__.py b/osmopy/__init__.py
index 3fd197f..e3bf016 100644
--- a/osmopy/__init__.py
+++ b/osmopy/__init__.py
@@ -1,14 +1,4 @@
 #!/usr/bin/env python
-__version__ = '0.0.3'
+__version__ = '0.0.4'
 
-__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']
diff --git a/osmopy/osmo_ctrl.py b/scripts/osmo_ctrl.py
index 2b8c4be..2b8c4be 100755
--- a/osmopy/osmo_ctrl.py
+++ b/scripts/osmo_ctrl.py
diff --git a/osmopy/osmo_interact_common.py b/scripts/osmo_interact_common.py
index 5efc22d..5efc22d 100644
--- a/osmopy/osmo_interact_common.py
+++ b/scripts/osmo_interact_common.py
diff --git a/osmopy/osmo_interact_ctrl.py b/scripts/osmo_interact_ctrl.py
index 9b1a20b..9b1a20b 100755
--- a/osmopy/osmo_interact_ctrl.py
+++ b/scripts/osmo_interact_ctrl.py
diff --git a/osmopy/osmo_interact_vty.py b/scripts/osmo_interact_vty.py
index b57cd8c..b57cd8c 100755
--- a/osmopy/osmo_interact_vty.py
+++ b/scripts/osmo_interact_vty.py
diff --git a/osmopy/osmo_verify_transcript_ctrl.py b/scripts/osmo_verify_transcript_ctrl.py
index 3afbc62..3afbc62 100755
--- a/osmopy/osmo_verify_transcript_ctrl.py
+++ b/scripts/osmo_verify_transcript_ctrl.py
diff --git a/osmopy/osmo_verify_transcript_vty.py b/scripts/osmo_verify_transcript_vty.py
index e70c36c..e70c36c 100755
--- a/osmopy/osmo_verify_transcript_vty.py
+++ b/scripts/osmo_verify_transcript_vty.py
diff --git a/osmopy/osmodumpdoc.py b/scripts/osmodumpdoc.py
index 2464b05..2464b05 100644
--- a/osmopy/osmodumpdoc.py
+++ b/scripts/osmodumpdoc.py
diff --git a/osmopy/osmotestconfig.py b/scripts/osmotestconfig.py
index 2132c43..2132c43 100644
--- a/osmopy/osmotestconfig.py
+++ b/scripts/osmotestconfig.py
diff --git a/osmopy/osmotestvty.py b/scripts/osmotestvty.py
index e513c05..e513c05 100644
--- a/osmopy/osmotestvty.py
+++ b/scripts/osmotestvty.py
diff --git a/osmopy/soap.py b/scripts/soap.py
index f1da8f2..f1da8f2 100755
--- a/osmopy/soap.py
+++ b/scripts/soap.py
diff --git a/osmopy/twisted_ipa.py b/scripts/twisted_ipa.py
index bb8323d..bb8323d 100755
--- a/osmopy/twisted_ipa.py
+++ b/scripts/twisted_ipa.py
diff --git a/setup.py b/setup.py
index 993c2b3..533272e 100755
--- a/setup.py
+++ b/setup.py
@@ -20,17 +20,15 @@ from osmopy import __version__
 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',