diff options
| -rwxr-xr-x | contrib/jenkins.sh | 5 | ||||
| -rwxr-xr-x | scripts/osmo_ctrl.py | 6 | ||||
| -rwxr-xr-x | setup.py | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c4ddf7d..d18b19d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -6,7 +6,7 @@ COM_FLAGS='-m compileall' # FIXME: remove once python 2 support is deprecated PY2=python2 -PY2_LIST="osmopy scripts/osmo_ctrl.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" +PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" $PY2 ./setup.py install $PY2 tests/test_py2.py for f in $PY2_LIST @@ -24,4 +24,7 @@ do $PY3 $COM_FLAGS $f done +cd scripts +./osmo_ctrl.py --help + # TODO: add more tests diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index bec6d1d..8c0608f 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- mode: python-mode; py-indent-tabs-mode: nil -*- """ /* - * Copyright (C) 2016 sysmocom s.f.m.c. GmbH + * Copyright (C) 2016-2017 sysmocom s.f.m.c. GmbH * * All Rights Reserved * @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ """ -from __future__ import print_function + from optparse import OptionParser from osmopy.osmo_ipa import Ctrl import socket @@ -25,6 +25,7 @@ if sys.version_info.major == 2: elif sys.version_info.major == 3: scripts = ["scripts/osmo_interact_vty.py", "scripts/osmo_interact_ctrl.py", + "scripts/osmo_ctrl.py", "scripts/soap.py", "scripts/twisted_ipa.py", "scripts/osmo_verify_transcript_vty.py", |