From 016f83f0d7647ef31d1cfe4a66ed3ed4abda6673 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sun, 5 Sep 2021 18:40:43 +0000 Subject: [PATCH] require >= Python 3.7 This means that Ubuntu Bionic (Python 3.6.9) is no longer supported --- mmgen/main_addrimport.py | 2 +- mmgen/util.py | 3 +-- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mmgen/main_addrimport.py b/mmgen/main_addrimport.py index f7473fb8..6d1e9f39 100755 --- a/mmgen/main_addrimport.py +++ b/mmgen/main_addrimport.py @@ -118,7 +118,7 @@ def check_opts(tw): async def import_addr(tw,addr,label,rescan,msg_fmt,msg_args): try: - task = asyncio.ensure_future(tw.import_address(addr,label,rescan)) # Python 3.7+: create_task() + task = asyncio.create_task(tw.import_address(addr,label,rescan)) if rescan: start = time.time() while True: diff --git a/mmgen/util.py b/mmgen/util.py index af80a3e5..6ae30a24 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -927,5 +927,4 @@ def run_session(callback,backend=None): else: return await callback - # return asyncio.run(do()) # Python 3.7+ - return asyncio.get_event_loop().run_until_complete(do()) + return asyncio.run(do()) diff --git a/setup.py b/setup.py index 41665b60..202fd76c 100755 --- a/setup.py +++ b/setup.py @@ -21,11 +21,11 @@ from subprocess import run,PIPE from shutil import copy2 sys_ver = sys.version_info[:2] -req_ver = (3,6) +req_ver = (3,7) ver2f = lambda t: float('{}.{:03}'.format(*t)) if ver2f(sys_ver) < ver2f(req_ver): - m = '{}.{}: incorrect Python version. MMGen requires Python {}.{} or greater\n' + m = '{}.{}: unsupported Python version. MMGen requires Python {}.{} or greater\n' sys.stderr.write(m.format(*sys_ver,*req_ver)) sys.exit(1)