diff --git a/mmgen/data/release_date b/mmgen/data/release_date index 74e85a7c..f53c8cf6 100644 --- a/mmgen/data/release_date +++ b/mmgen/data/release_date @@ -1 +1 @@ -October 2023 +November 2023 diff --git a/mmgen/data/version b/mmgen/data/version index 71c07cec..8b4d3dcf 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -14.0.dev10 +14.0.dev11 diff --git a/mmgen/util.py b/mmgen/util.py index 7a9fbd23..85c8919a 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -189,6 +189,7 @@ def fmt_list(iterable,fmt='dfl',indent='',conv=None): 'utf8': ( str, ", ", "“", "”"), 'bare': ( repr, " ", "", ""), 'no_quotes': ( str, ", ", "", ""), + 'compact': ( str, ",", "", ""), 'no_spc': ( str, ",", "'", "'"), 'min': ( str, ",", "", ""), 'repr': ( repr, ", ", "", ""), @@ -205,6 +206,7 @@ def fmt_dict(mapping,fmt='dfl',kconv=None,vconv=None): 'square': ( str, str, ", ", "'{}' [{}]" ), 'equal': ( str, str, ", ", "'{}'={}" ), 'equal_spaced': ( str, str, ", ", "'{}' = {}" ), + 'equal_compact': ( str, str, ",", "'{}'={}" ), 'kwargs': ( str, repr, ", ", "{}={}" ), 'colon': ( str, repr, ", ", "{}:{}" ), }[fmt] diff --git a/test/include/coin_daemon_control.py b/test/include/coin_daemon_control.py index f528db0f..6b09b7dc 100755 --- a/test/include/coin_daemon_control.py +++ b/test/include/coin_daemon_control.py @@ -15,7 +15,7 @@ test.include.coin_daemon_control: Start and stop daemons for the MMGen test suit import sys from pathlib import PurePath -sys.path[0] = str(PurePath(*PurePath(sys.modules[__name__].__file__).parts[:-3])) +sys.path[0] = str(PurePath(*PurePath(__file__).parts[:-3])) from mmgen.cfg import Config,gc from mmgen.util import msg,die,oneshot_warning,async_run diff --git a/test/include/test_init.py b/test/include/test_init.py index 12f5f847..e0e42ee3 100755 --- a/test/include/test_init.py +++ b/test/include/test_init.py @@ -15,7 +15,7 @@ test.include.test_init: Initialization module for test scripts import sys,os from pathlib import PurePath os.environ['MMGEN_TEST_SUITE'] = '1' -repo_root = str(PurePath(*PurePath(sys.modules[__name__].__file__).parts[:-3])) +repo_root = str(PurePath(*PurePath(__file__).parts[:-3])) os.chdir(repo_root) sys.path[0] = repo_root