From 8739f9c4fcc08ff33d0b2cc7fb8effe872f52307 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 11 Jul 2018 14:03:32 +0200 Subject: [PATCH] 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 --- osmopy/__init__.py | 2 +- {scripts => osmopy}/twisted_ipa.py | 0 scripts/soap.py | 2 +- setup.py | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename {scripts => osmopy}/twisted_ipa.py (100%) 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 @@ elif sys.version_info.major == 3: "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",