Change in python/osmo-python-tests[master]: Move twisted_ipa.py to osmopy lib

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9960 )

Change subject: Move twisted_ipa.py to osmopy lib
......................................................................

Move twisted_ipa.py to osmopy lib

twisted_ipa is a module expected to be used by other python scripts, so
move it to osmopy dir to be installed as a lib (in python path) so it
can be later used.

twisted_ipa has some features to use it standalone for testing purposes.
This feature can still be used from new installation path.

Change-Id: I33a0c4263297abd9e111bf43e6e9967c06474318
---
M osmopy/__init__.py
R osmopy/twisted_ipa.py
M scripts/soap.py
M setup.py
4 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/osmopy/__init__.py b/osmopy/__init__.py
index 4e818ed..2195498 100644
--- a/osmopy/__init__.py
+++ b/osmopy/__init__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 __version__ = '0.0.9'
 
-__all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact']
+__all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'twisted_ipa']
diff --git a/scripts/twisted_ipa.py b/osmopy/twisted_ipa.py
similarity index 100%
rename from scripts/twisted_ipa.py
rename to osmopy/twisted_ipa.py
diff --git a/scripts/soap.py b/scripts/soap.py
index f1da8f2..dc06e1e 100755
--- a/scripts/soap.py
+++ b/scripts/soap.py
@@ -25,7 +25,7 @@
 __version__ = "0.7.1" # bump this on every non-trivial change
 
 from twisted.internet import defer, reactor
-from twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version
+from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version
 from osmopy.osmo_ipa import Ctrl
 from treq import post, collect
 from suds.client import Client
diff --git a/setup.py b/setup.py
index a8fd6e9..1d785e7 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,6 @@
         "scripts/osmo_ctrl.py",
         "scripts/osmo_rate_ctr2csv.py",
         "scripts/soap.py",
-        "scripts/twisted_ipa.py",
         "scripts/osmo_interact_vty.py",
         "scripts/osmo_interact_ctrl.py",
         "scripts/osmo_verify_transcript_vty.py",

-- 
To view, visit https://gerrit.osmocom.org/9960
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I33a0c4263297abd9e111bf43e6e9967c06474318
Gerrit-Change-Number: 9960
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180711/2590d1d7/attachment.htm>