tradedangerous 11.5.3__py3-none-any.whl → 12.0.1__py3-none-any.whl

tradedangerous/tradeenv.py

@@ -258,8 +258,18 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
         if key == "WARN":
             
             def _WARN_ENABLED(outText, *args, stderr: bool = False, **kwargs):
+                try:
+                    # Try to apply .format if args/kwargs are supplied
+                    if args or kwargs:
+                        msg = str(outText).format(*args, **kwargs)
+                    else:
+                        msg = str(outText)
+                except Exception:
+                    # Fallback: dump raw message + args/kwargs repr
+                    msg = f"{outText} {args!r} {kwargs!r}"
+
                 self.uprint(
-                    f"{self.theme.warn}{self.theme.WARNING}: {str(outText).format(*args, **kwargs)}",
+                    f"{self.theme.warn}{self.theme.WARNING}: {msg}",
                     stderr=stderr,
                 )
             
@@ -269,6 +279,7 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
             noteFn = _WARN_DISABLED if self.quiet > 1 else _WARN_ENABLED
             setattr(self, key, noteFn)
             return noteFn
+
         
         return None
     

tradedangerous/version.py

@@ -12,5 +12,5 @@
 """just keeper of current version"""
 
 # TODO: remember to update tests when version changes
-__version__ = '11.5.3'
+__version__ = '12.0.1'
 

{tradedangerous-11.5.3.dist-info → tradedangerous-12.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tradedangerous
-Version: 11.5.3
+Version: 12.0.1
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus
@@ -11,12 +11,13 @@ Project-URL: Documentation, https://github.com/eyeonus/Trade-Dangerous/wiki
 Project-URL: Source Code, https://github.com/eyeonus/Trade-Dangerous
 Keywords: trade,elite,elite-dangerous
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -31,8 +32,10 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 
@@ -41,9 +44,10 @@ Dynamic: summary
 TradeDangerous  
 Copyright (C) Oliver "kfsone" Smith, July 2014  
 Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017  
-Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2021
+Copyright (C) Stefan 'Tromador' Morrell 2025  
+Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2025  
 
-REQUIRES PYTHON 3.4 OR HIGHER.
+REQUIRES PYTHON 3.10 OR HIGHER.
 
 ----------
 

{tradedangerous-11.5.3.dist-info → tradedangerous-12.0.1.dist-info}/RECORD

@@ -1,48 +1,55 @@
 trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
 tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
-tradedangerous/cache.py,sha256=BM3jxnezff0fd8WhIbnVn9dDuULtLMKld0oiY8h7nZU,37233
-tradedangerous/cli.py,sha256=dLekZ3MTbn9XcSGtE532qZF3iSnsb5G-ddQyErwTv9o,4559
+tradedangerous/cache.py,sha256=fhnEzE2g4999sMI6JowTKYZj1epgsUdLZFjLBKKgsKQ,43829
+tradedangerous/cli.py,sha256=aTZf6N7BD_G99r43n58xDSYH4gmvz0CBRU6vAgS3__4,4561
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
-tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
+tradedangerous/csvexport.py,sha256=bwDcFKYPe-qdEG0HJONJ5Ij8PTphAD1mBOi_kK4nXSo,7970
 tradedangerous/edscupdate.py,sha256=To7hL2FuR4A7A4gJfvow_jGl6mlD7aP-Drv1rEkwy-I,17310
 tradedangerous/edsmupdate.py,sha256=9IANIASA8ZKnZsLPBRAh7IArDRsa0jriL2UwjqKJ1fI,14928
 tradedangerous/formatting.py,sha256=R8GX2Zya1xazLOOBIWlLqUEjIESZJO41UlvhZDbyY4Q,6908
 tradedangerous/fs.py,sha256=Uqc0wEbORJektD22MQgjqerxbJbc3mUee9MlXna5Wx0,3897
-tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
-tradedangerous/jsonprices.py,sha256=vNj3Pz2NN39FgpHMo_TRH6MI3GQaFGIa2idg2HYYu2A,7229
+tradedangerous/gui.py,sha256=BWazhqpOKVCy7Bv_Hc-i1JfNYc2FN5xKX8NOgDlDqtM,43676
 tradedangerous/mapping.py,sha256=Bf2G8LzP1Bat5k3hFs9XyeI1z3tfUpfeh4nuLP2QJuQ,4122
-tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
+tradedangerous/prices.py,sha256=-hwu6Dgf_cS4_3ew35k_6iE6L41AYOSBfx5UaNgmCl8,6906
 tradedangerous/submit-distances.py,sha256=m1qAuqH_yq8euMSWSqkmkTNM4a136Vl5WrGmTk15LiM,11745
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
-tradedangerous/tradecalc.py,sha256=ZuTxp_9gMj4wDGalp1k_VfoVupwF8Oh9FOYML3vN-oM,42749
-tradedangerous/tradedb.py,sha256=mitKkS4MczivDK_K7A-IC94hkObUmGWFhwIrh_ts9qw,72282
-tradedangerous/tradeenv.py,sha256=aIeK291Ene98kaEEu1LvlJ4KT4EvPfIXlT4IfZnpVc0,11917
+tradedangerous/tradecalc.py,sha256=LA37VAaVS8lSRW1Ydmo28R9FmFwhjoieOMG6KxVtn9A,46082
+tradedangerous/tradedb.py,sha256=nPd-RD5HtgBswnlRPAO0Z0nDbxXeJNj02g1DLpnl49s,78428
+tradedangerous/tradeenv.py,sha256=JA0yMStJ_zfLGHT2yxuY0s1cBvQz1ztL1zTYJslMZJk,12314
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=zRa68iWjzmvpmz4IBsUJcKlNaDnryOab6peG9xB5FHI,646
-tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
-tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
-tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
-tradedangerous/commands/buy_cmd.py,sha256=qgOBTzCvcYgLOcdkx7BpqF-rSs6GFjOL_f3Gzutmx1I,13947
-tradedangerous/commands/commandenv.py,sha256=72hEqaZzUBsTiYzkJrGP6Z1EN7WyvyZrKHxlRQNp--4,9868
+tradedangerous/version.py,sha256=Rh30JGNdda_HO5HfTjrrAKbcd3N-vLrGJf6eWPxtZQ0,646
+tradedangerous/commands/TEMPLATE.py,sha256=seMXDN_Nf_Rvj_5BivI-0yhVT6W9iRDihr5yo8kr5qw,2069
+tradedangerous/commands/__init__.py,sha256=UvcWgcr_PVScbJ6R83iaUb2_4Ttmft85HYexTFo7FwU,9171
+tradedangerous/commands/buildcache_cmd.py,sha256=6CkmoDYthECkMcu5I3Ljyis42yy-bnUcllAlSF-Xwi8,3318
+tradedangerous/commands/buy_cmd.py,sha256=hRX2uAR9MAHc_Zk7TodS14f9gQ8kf3eduGRUmTXODbY,14568
+tradedangerous/commands/commandenv.py,sha256=4czlC31wtfk2l9EORlDMTiD9LIefHgwJkxzqOAsKbaM,9852
 tradedangerous/commands/exceptions.py,sha256=sisGoBvOpt25TYWWjp-s-k_--O_nZe5Zd9HhAW3SElA,3487
-tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
-tradedangerous/commands/import_cmd.py,sha256=czbfBR0H1jTGX67b38BxiFi77EB8COM8ImztP7yPdzo,5654
+tradedangerous/commands/export_cmd.py,sha256=y70eamRQOXuWTpcsBfF1e1lWTN10Aqcg9A-AKIREYtM,6011
+tradedangerous/commands/import_cmd.py,sha256=jO3S63AugsV_0jsqFqtY7lRyTUi2jEqmN-bqXWFxjAs,7337
 tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTSVrtaZx0,8392
-tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
+tradedangerous/commands/market_cmd.py,sha256=Pdvk_Q_XKw-ztE6O-__W44tUHLYaX_ouUhdix188h_E,6228
 tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
-tradedangerous/commands/olddata_cmd.py,sha256=6rpPRRs4kLhV9c0sogmctVAjta7v0L0Deu999spXY2s,7888
+tradedangerous/commands/olddata_cmd.py,sha256=qanF6vVHBumMaFb_0Ds8jTwdAsQFQFDXmOh_xPfTRm0,8823
 tradedangerous/commands/parsing.py,sha256=IFYAVrEnlweocM08czG39oqRGuCgI7O5eN1-3NXQezs,6599
-tradedangerous/commands/rares_cmd.py,sha256=L_QoW2zIZTU9Jpavt_K2fZyu8T153nUSuVqIiz4uksQ,9207
-tradedangerous/commands/run_cmd.py,sha256=HtvxKfD2ef_fUCDdUzBv9yRwd2gBOqIq4hzUAOLgcyU,47650
-tradedangerous/commands/sell_cmd.py,sha256=yF0Bsq_gAycG8FQI0-JWmk_DvNnAgyno2wvj-PyrqBs,8269
-tradedangerous/commands/shipvendor_cmd.py,sha256=opszTmFMVDkker2ON-iAql82HzVmQ_5MDklb3MNUmJI,6984
-tradedangerous/commands/station_cmd.py,sha256=gnWOT-Z8DfOeA4GNjUwj57eNxuNGh5mPZ-D0E_BeoTw,16232
+tradedangerous/commands/rares_cmd.py,sha256=Wftrxv99Qmvkwi5wANZPJi3DvJCakHxxDWQWi6pW4rs,8740
+tradedangerous/commands/run_cmd.py,sha256=QI38iueb_k6ezvaApVUs3Lb10NnMzPaCzX4YpIIhs-U,49929
+tradedangerous/commands/sell_cmd.py,sha256=Cv88Ikp3xRtL88yzjfRmXJSCbGdCVLuiFo6URdcCydA,8810
+tradedangerous/commands/shipvendor_cmd.py,sha256=EsdQvCEkoGsJFnhFP6hYszAWNpAtPTGzhj-oCCo0sgI,1829
+tradedangerous/commands/station_cmd.py,sha256=ovBXj7feWZaQeyG3ZykTJJRoW82oaetkW8AgW6JcUuE,2182
 tradedangerous/commands/trade_cmd.py,sha256=o4Xdel5asGY8i6qES95fLHdyfyjKdC5CTOQrZIeu0i4,3016
-tradedangerous/commands/update_cmd.py,sha256=2UWR6aDbAbvtKFtfmehVwFUBQfJM5KThR71HoC6wVnM,14564
-tradedangerous/commands/update_gui.py,sha256=WwZvvad7pF0LasZztjO6v5OTWzCZlcey2DFj8h91dWg,23331
+tradedangerous/commands/update_cmd.py,sha256=4u4j4IZKFQ3yJcSgDXdc4GelmRuCoEMcxsNwGTo1ZsU,2070
+tradedangerous/db/__init__.py,sha256=lT15zI5IaiIVGS5VWD5EY4Xg3gHhwC6nbJo0hTFrb1o,882
+tradedangerous/db/adapter.py,sha256=en1rVsa2vAcsFesEblImg9_qwwHLWIBbDZqtEnDdbJU,7272
+tradedangerous/db/config.py,sha256=PLFXMWS_eB6DN8ik5wZdHyDn66-Ot2ChE8PSDbJbeO4,3217
+tradedangerous/db/engine.py,sha256=kJvImzqVpCLwSYtIlvKZ-j70kWoJ1Z0Z064h2JgJWVc,9390
+tradedangerous/db/lifecycle.py,sha256=HnI6PmNm0DvjyrlvchvWKBn354qEl7FFdh7ScW1ivyI,11572
+tradedangerous/db/locks.py,sha256=sBNc5YFpCAxLEGhD6shaHBXJQJlVck9GmU3pg5yc6rk,7896
+tradedangerous/db/orm_models.py,sha256=_TfjHDe0OqT0SjZn0U9t5zzevwnhv7WBT02TuS2pIx4,15628
+tradedangerous/db/paths.py,sha256=zmuxdeVvMClV3SzoZEbWDwJq-RV3chLWdZdvTui3CjU,3805
+tradedangerous/db/utils.py,sha256=vka8mFUzVi2UF56NyXn9mL7Pa28DLV7O99Kjshog1vg,24333
 tradedangerous/mfd/__init__.py,sha256=g8pT9Ev_le_yOeAF7sr9fUuEi8VW3u9n_qq-xLga1xw,2958
 tradedangerous/mfd/saitek/__init__.py,sha256=CGgkAik87Kb5uc43G0bBFueD47bb_BydDM8qb7YQLyA,62
 tradedangerous/mfd/saitek/directoutput.py,sha256=ReBzax7ttoffzH8DLXx0AS2RFLLQWOQUw1ESQUjOMGk,24840
@@ -60,20 +67,17 @@ tradedangerous/misc/importeddbstats.py,sha256=iLAcrFzdwiMm_MnUuaHcT_xGgZF8pfEEd1
 tradedangerous/misc/prices-json-exp.py,sha256=Fpm62ugP35ZBqnRs6ekYfS3GoDFYmvLD3b3SFJfaMOI,4944
 tradedangerous/misc/progress.py,sha256=QwWgbbhAuMB7LG0o-jy7WxN1uhLHtN0FwKkV314ulrA,7170
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
-tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=J54Lm2-bd1wFZhK_6ZdLUT5_bHdNcJcCx3VRN6gU5Ew,21363
+tradedangerous/plugins/eddblink_plug.py,sha256=xXucqBeZwjLGd9gJfL2RIJSv4mEB3I6xV0Y0paVvMXs,26981
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
-tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
-tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
-tradedangerous/plugins/spansh_plug.py,sha256=PXFarH_i0QASrIoTpkYjq27ZgeRqGSH9sac5OqYLMLU,38028
+tradedangerous/plugins/spansh_plug.py,sha256=7emfdC3WzoEDOadRZ4wfX7zHVQKahPsntpP-qrRaGSg,108482
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
-tradedangerous/templates/TradeDangerous.sql,sha256=XJ0T09OiS9UdYKJXXAG-rCe6T_ua4MU-icb2lD7iEz0,9342
-tradedangerous-11.5.3.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.5.3.dist-info/METADATA,sha256=FLfC5lbHnXnJ38BZ3uPDrtj79OJQlhBEi4cnhUVV584,4663
-tradedangerous-11.5.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tradedangerous-11.5.3.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.5.3.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.5.3.dist-info/RECORD,,
+tradedangerous/templates/TradeDangerous.sql,sha256=pCw2Js8GQniqAWC6N3SL-ujyqlLYCeR2-SI-qhk6VsI,9336
+tradedangerous-12.0.1.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-12.0.1.dist-info/METADATA,sha256=KP4Qmv2jETxUWN_Q-JGyGzQvakCJhQCLbZJ62FmXDl4,4787
+tradedangerous-12.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tradedangerous-12.0.1.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-12.0.1.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-12.0.1.dist-info/RECORD,,

{tradedangerous-11.5.3.dist-info → tradedangerous-12.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any