diff options
| author | Josh Morman <mormjb@gmail.com> | 2020-05-29 10:11:43 -0400 |
|---|---|---|
| committer | Josh Morman <mormjb@gmail.com> | 2020-06-04 10:05:48 -0400 |
| commit | 13b6fc6435e21926977f33e90d93f6fb9530931c (patch) | |
| tree | 787648651682a624241544d317c02ac740ba5136 /gr-utils | |
| parent | d933a40f9d117ae3f73600b3b8b76494e9d6ed3d (diff) | |
pybind: clean up unused script and modtool tests
Diffstat (limited to 'gr-utils')
| -rw-r--r-- | gr-utils/bindtool/scripts/batch_gen_gr_modules.py | 25 | ||||
| -rw-r--r-- | gr-utils/modtool/core/rename.py | 1 | ||||
| -rw-r--r-- | gr-utils/modtool/tests/test_modtool.py | 23 |
3 files changed, 16 insertions, 33 deletions
diff --git a/gr-utils/bindtool/scripts/batch_gen_gr_modules.py b/gr-utils/bindtool/scripts/batch_gen_gr_modules.py deleted file mode 100644 index a133b18cb3..0000000000 --- a/gr-utils/bindtool/scripts/batch_gen_gr_modules.py +++ /dev/null @@ -1,25 +0,0 @@ -from gnuradio.bindtool import BindingGenerator - -prefix = '/share/gnuradio/grnext' -output_dir = '/share/tmp/test_pybind' -namespace = ['gr'] -module_dir = '/share/gnuradio/grnext/src/gnuradio/gnuradio-runtime/include/gnuradio' -prefix_include_root = 'gnuradio' #pmt, gnuradio/digital, etc. - -prefix = '/share/gnuradio/grnext' -output_dir = '/share/tmp/test_pybind' -namespace = ['gr','digital'] -module_dir = '/share/gnuradio/grnext/src/gnuradio/gr-digital/include' -prefix_include_root = 'gnuradio/digital' #pmt, gnuradio/digital, etc. - -prefix = '/share/gnuradio/grnext' -output_dir = '/share/tmp/test_pybind' -namespace = ['gr','fft'] -module_dir = '/share/gnuradio/grnext/src/gnuradio/gr-fft/include' -prefix_include_root = 'gnuradio/fft' #pmt, gnuradio/digital, etc. - -import warnings -with warnings.catch_warnings(): - warnings.filterwarnings("ignore", category=DeprecationWarning) - bg = BindingGenerator(prefix, namespace, prefix_include_root, output_dir) - bg.gen_bindings(module_dir)
\ No newline at end of file diff --git a/gr-utils/modtool/core/rename.py b/gr-utils/modtool/core/rename.py index 161d714143..5888f8b1b8 100644 --- a/gr-utils/modtool/core/rename.py +++ b/gr-utils/modtool/core/rename.py @@ -62,7 +62,6 @@ class ModToolRename(ModTool): oldname = self.info['oldname'] newname = self.info['newname'] logger.info(f"In module '{module}' rename block '{oldname}' to '{newname}'") - self._run_swig_rename(self._file['swig'], oldname, newname) self._run_grc_rename(self.info['modname'], oldname, newname) self._run_python_qa(self.info['modname'], oldname, newname) self._run_python(self.info['modname'], oldname, newname) diff --git a/gr-utils/modtool/tests/test_modtool.py b/gr-utils/modtool/tests/test_modtool.py index c233337b55..c118fe83bc 100644 --- a/gr-utils/modtool/tests/test_modtool.py +++ b/gr-utils/modtool/tests/test_modtool.py @@ -23,13 +23,22 @@ try: except: skip_pylint_test = True -from modtool.core import ModToolNewModule -from modtool.core import ModToolAdd -from modtool.core import ModToolDisable -from modtool.core import ModToolException -from modtool.core import ModToolMakeYAML -from modtool.core import ModToolRename -from modtool.core import ModToolRemove +try: # for debugging, full path must be given + from gnuradio.modtool.core import ModToolNewModule + from gnuradio.modtool.core import ModToolAdd + from gnuradio.modtool.core import ModToolDisable + from gnuradio.modtool.core import ModToolException + from gnuradio.modtool.core import ModToolMakeYAML + from gnuradio.modtool.core import ModToolRename + from gnuradio.modtool.core import ModToolRemove +except: + from modtool.core import ModToolNewModule + from modtool.core import ModToolAdd + from modtool.core import ModToolDisable + from modtool.core import ModToolException + from modtool.core import ModToolMakeYAML + from modtool.core import ModToolRename + from modtool.core import ModToolRemove class TestModToolCore(unittest.TestCase): """ The tests for the modtool core """ |