Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'python3_fix' into next | Andrej Rode | 2018-06-24 | 47 | -289/+377 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge conflict resolution has been applied to following conflicts: * Typos: * gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py * gr-blocks/python/blocks/qa_wavfile.py * gr-filter/examples/gr_filtdes_api.py * grc/blocks/parameter.xml * gr-uhd/python/uhd/__init__.py * ValueError -> RuntimeError: * gr-blocks/python/blocks/qa_hier_block2.py * relative Imports & other Py3k: * gr-digital/python/digital/psk_constellations.py * gr-digital/python/digital/qam_constellations.py * gr-digital/python/digital/test_soft_decisions.py * gr-digital/python/digital/gfsk.py * SequenceCompleter: * gr-utils/python/modtool/modtool_add.py * gr-utils/python/modtool/modtool_rename.py * gr-utils/python/modtool/modtool_rm.py * Updated API on next: * gr-blocks/grc/blocks_file_source.xml * gr-blocks/python/blocks/qa_file_source_sink.py * gr-qtgui/grc/qtgui_time_sink_x.xml * GRC Py3k Updates: * grc/core/Block.py * grc/core/Constants.py * grc/core/Platform.py * grc/core/utils/odict.py * grc/gui/Actions.py * grc/gui/Block.py * grc/gui/Executor.py * grc/gui/Port.py | ||||
| * | python: Py3k compat | Andrej Rode | 2018-06-23 | 3 | -3/+3 |
| | | |||||
| * | modtool: modify str.translate() for python3 compatibility | Swapnil Negi | 2018-05-26 | 1 | -1/+2 |
| | | |||||
| * | Fix typos from switch to Python 3 | Håkon Vågsether | 2017-08-21 | 6 | -10/+10 |
| | | |||||
| * | Merge branch 'next' into python3 | Johnathan Corgan | 2017-06-22 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: gr-uhd/apps/uhd_app.py | ||||
| * | | Use GR_*_MIN_VERSION cmake variables from PR #1215 | Douglas Anderson | 2017-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-03-16 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/swig/blocks_swig.py.in gr-uhd/apps/uhd_app.py | ||||
| * | | | python3: update non-GRC components to use python2 or python3 | Douglas Anderson | 2017-02-26 | 46 | -284/+372 |
| | | | | |||||
* | | | | modtool: Replace globals().values() with ModTool.__subclasses__() | Martin Braun | 2018-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effectively reapplies this commit by Marcus Müller: ``` Making gr_modtool start faster by avoiding to iterate over all globals All subclasses of object have a __subclasses__ method, which gives the subclasses. That's a lot fewer objects than what's in globals(). ``` | ||||
* | | | | Merge branch 'master' into next | Martin Braun | 2018-02-03 | 11 | -19/+51 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'maint' | Martin Braun | 2018-02-03 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | utils: gr_modtool template uses 'numpy.float' which defaults to ↵ | Jacob Gilbert | 2018-02-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | double-precision floating point instead of 'numpy.float32' which is single precision and what GR expects | ||||
| * | | | | Comment typo fixing. | luz.paz | 2018-02-03 | 8 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | Luzpaz went ahead and found typos using `codespell -q 3`. | ||||
| * | | | | Adding readline capabilities to gr_modtool | Marcus Müller | 2018-02-03 | 3 | -9/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * main advantage: better line editing * tab-completion for gr_modtool add | ||||
| * | | | | Making gr_modtool start faster by avoiding to iterate over all globals | Marcus Müller | 2018-02-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All subclasses of object have a __subclasses__ method, which gives the subclasses. That's a lot fewer objects than what's in globals(). | ||||
* | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-06-22 | 2 | -2/+2 |
|\| | | | | |_|_|/ |/| | | | |||||
| * | | | sort input files | Bernhard M. Wiedemann | 2017-06-05 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when building packages (e.g. for openSUSE Linux) (random) filesystem order of input files influences ordering of functions in the output, thus without the patch, builds (in disposable VMs) would usually differ. See https://reproducible-builds.org/ for why this matters. | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-15 | 1 | -2/+2 |
|\| | | | |_|/ |/| | | |||||
| * | | Modified add_custom_command to not try to execute "" | Marcus Müller | 2017-02-15 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | former custom command called ""; this works fine on build systems were this is expanded by shell, but fails on some of my systems where add_custom_command's COMMAND parameter is directly executed (because there's no executable ""). | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2017-01-26 | 1 | -1/+6 |
|\| | |||||
| * | Use -undefined dynamic_lookup linkage for python on macos in newmod | kolen | 2017-01-26 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-11-27 | 1 | -0/+17 |
|\| | |||||
| * | utils: Set cmake policies to suppress warnings for OOT modules. | Ron Economos | 2016-11-27 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-11-22 | 2 | -24/+0 |
|\| | |||||
| * | Merge remote-tracking branch 'github/maint-remove-obsolete-doxygen-XML-tags' ↵ | Johnathan Corgan | 2016-11-22 | 2 | -24/+0 |
| |\ | | | | | | | | | | into maint | ||||
| | * | remove obsolete doxygen XML tags | A. Maitland Bottoms | 2016-11-21 | 2 | -24/+0 |
| | | | | | | | | | | | | | | | | | | | | | "The items XML_SCHEMA and XML_DTD are not used and there is no plan for using them, so declared obsolete." -- Ddoxygen commit ba31ee73aad3bdc6b3854add2db01c302c9cf19c This patch reduces noise about obsolete settings from Doxygen. | ||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-28 | 1 | -0/+8 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt gr-digital/swig/digital_swig.i gr-trellis/swig/CMakeLists.txt | ||||
| * | | Merge branch 'maint' | Johnathan Corgan | 2016-10-28 | 1 | -0/+8 |
| |\| | |||||
| | * | Sync modtool GrPlatform.cmake with main GNURadio version. | Philip Balister | 2016-10-25 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | This picks up a change needed to build OOT modules for OpenEmbedded builds that use /lib64 on the target. Signed-off-by: Philip Balister <philip@balister.org> | ||||
* | | | grc: move grcc into grc subtree | Sebastian Koslowski | 2016-09-23 | 2 | -90/+0 |
| | | | |||||
* | | | cleanup: remove nargs=1 from ArgumentParser | Jiří Pinkava | 2016-09-17 | 2 | -4/+4 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-08-16 | 2 | -46/+183 |
|\| | | |||||
| * | | modtool: update python docstring generation | Sebastian Müller | 2016-08-15 | 2 | -46/+183 |
| |/ | |||||
* | | filter: replace OptionParser by ArgumentParser for gr-utils and gr-qtgui | Jiří Pinkava | 2016-08-06 | 12 | -147/+111 |
| | | |||||
* | | Merge remote-tracking branch 'github/nuke-cpack' into next | Johnathan Corgan | 2016-08-03 | 7 | -32/+7 |
|\ \ | | | | | | | | | | | | | Conflicts: gr-vocoder/CMakeLists.txt | ||||
| * | | cmake: nuke cpack from existence | Johnathan Corgan | 2016-08-03 | 7 | -32/+7 |
| | | | | | | | | | | | | | | | | | | CPack is not used, unmaintaned, and broken. This does not eliminate any MSVC build functionality. | ||||
* | | | Merge remote-tracking branch 'github/require-logging' into next | Johnathan Corgan | 2016-08-03 | 1 | -43/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | cmake: remove ENABLE_GR_LOG and require log4cpp | Johnathan Corgan | 2016-06-26 | 1 | -43/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'pinkavaj/argparse-modtool-02' into next | Johnathan Corgan | 2016-08-01 | 14 | -232/+151 |
|\ \ \ | |||||
| * | | | modtool: replace OptionParser by ArgumentParser | Jiří Pinkava | 2016-06-30 | 14 | -232/+151 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'pinkavaj/argparse-filter-01' into next | Johnathan Corgan | 2016-08-01 | 4 | -48/+36 |
|\ \ \ \ | |||||
| * | | | | utils: gr_read_file_metadata replace OptionParser by ArgumentParser | Jiří Pinkava | 2016-06-29 | 1 | -12/+8 |
| | | | | | |||||
| * | | | | utils: gr_plot_const replace OptionParser by ArgumentParser | Jiří Pinkava | 2016-06-29 | 1 | -17/+13 |
| | | | | | |||||
| * | | | | utils: gr_plot_char - replace OptionParser by ArgumentParser | Jiří Pinkava | 2016-06-29 | 1 | -18/+15 |
| | | | | | |||||
| * | | | | utils: plot_data - remove unused import | Jiří Pinkava | 2016-06-29 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-07-25 | 1 | -4/+10 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | utils: adapt grcc to refactored grc code | Sebastian Koslowski | 2016-07-07 | 1 | -4/+10 |
| | | | |||||
* | | | modtool: fix license formating | Jiří Pinkava | 2016-06-28 | 1 | -1/+1 |
| | | | |||||
* | | | modtool: fix template - copyrightholder filed | Jiří Pinkava | 2016-06-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-06-20 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: gr-atsc/lib/qa_atsci_fake_single_viterbi.cc gr-atsc/lib/qa_atsci_single_viterbi.cc |