From 517ac2c7e174231addf489dfdf543c973046b14f Mon Sep 17 00:00:00 2001 From: freqnik Date: Fri, 13 Oct 2023 00:18:06 -0400 Subject: [PATCH] Fix deprecated ImageDraw.Draw.textsize() to textbbox(). Update CHANGELOG. v0.14.0.6 pip release --- CHANGELOG.md | 5 +++++ setup.py | 6 +++--- src/utils/qr.py | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49ac3652..6289e8e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ CHANGELOG ======================== +# v0.14.0.6 (13/10/2023) +* FIX: Racially deprecated "whitelist" param in HTTPRequests adapter +* FIX: Deprecated ImageDraw.Draw.textsize() to textbbox() +* UPDATE: Include stripe depdencency + # v0.14.0.1 (18/09/2023) * CHANGE: Timeout for NodeRatings, Cities, Types reuqest * CHANGE: DetermineDenom() in wallet.py diff --git a/setup.py b/setup.py index c11076d7..2bc63c60 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='meile-gui', - version='0.13.3.2', + version='0.14.0.6', description='Meile dVPN powered by the Sentinel Network', long_description=readme, long_description_content_type="text/markdown", @@ -36,8 +36,8 @@ ], package_dir={"": "src"}, packages=find_packages(where="src"), - install_requires=['kivymd', 'pydash', 'treelib', 'kivyoav', 'pexpect', 'qrcode', 'save_thread_result', 'screeninfo', 'mapview', 'psutil', 'unidecode', 'dnspython','cosmpy','sentinel-protobuf'], - package_data={'conf': ['config/config.ini'], 'bin' : ['sentinelcli', 'warp-cli', 'warp-svc', 'tun2socks', 'v2ray'], 'awoc' : ['data/world.json'], + install_requires=['kivymd', 'pydash', 'treelib', 'kivyoav', 'pexpect', 'qrcode', 'save_thread_result', 'screeninfo', 'mapview', 'psutil', 'unidecode', 'dnspython','cosmpy==0.8.0','sentinel-protobuf>=0.3.1','stripe'], + package_data={'conf': ['config/config.ini'], 'bin' : ['sentinelcli', 'warp-cli', 'warp-svc', 'tun2socks', 'v2ray'], 'awoc' : ['datum/world.json'], 'fonts': ['Roboto-BoldItalic.ttf', 'arial-unicode-ms.ttf', 'mplus-2c-bold.ttf'], 'imgs' : ["ad.png","ae.png","af.png","ag.png", "ai.png","al.png","am.png","ao.png", "aq.png","ar.png","as.png","atom.png", diff --git a/src/utils/qr.py b/src/utils/qr.py index 3ea838fb..49d56514 100644 --- a/src/utils/qr.py +++ b/src/utils/qr.py @@ -66,9 +66,9 @@ def generate_qr_code(self, ADDRESS): robotoFont = ImageFont.truetype(self.MeileConfig.resource_path('../utils/fonts/Roboto-BoldItalic.ttf'), fontSize) draw = ImageDraw.Draw(background) - w,h = draw.textsize(DepositAddress) + _,_,w,h = draw.textbbox((0,0),str(DepositAddress), font=robotoFont) draw.text(((QRimg.size[0]+15 - w)/2,QRimg.size[1]-2),DepositAddress, (0,0,0), font=robotoFont) background.paste(QRimg, (0,0)) background.save(path.join(self.IMGDIR, DepositCoin + ".png")) - \ No newline at end of file +