From 72119d6818823286a69c33090a99da51f77e5e2e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 7 Oct 2020 09:58:51 +0100 Subject: [PATCH 1/3] EDMC: Revert accidental change of boolean logic not (A or B) != not A or B Although "not A and not B" would be equivalent. --- EDMC.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMC.py b/EDMC.py index db888f90..fac74186 100755 --- a/EDMC.py +++ b/EDMC.py @@ -300,7 +300,7 @@ sys.path: {sys.path}''' sys.exit(EXIT_LAGGING) # Ignore possibly missing shipyard info - elif not data['lastStarport'].get('commodities') or data['lastStarport'].get('modules'): + elif not (data['lastStarport'].get('commodities') or data['lastStarport'].get('modules')): logger.error("No commodities or outfitting (modules) in CAPI data") return From 42b71e8d2639600cf7d5b3db9f97d8c725f488e2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 7 Oct 2020 10:08:40 +0100 Subject: [PATCH 2/3] Release 4.1.2 --- ChangeLog.md | 6 ++++++ config.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 4b8a0e31..7006a312 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,12 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- +Release 4.1.2 +=== + +* Minor fix to EDMC.py to revert broken logic trying to detect when there is + neither commodities nor outfitting data for a station. + Release 4.1.1 === diff --git a/config.py b/config.py index 0d859c4c..1f756baa 100644 --- a/config.py +++ b/config.py @@ -13,7 +13,7 @@ appcmdname = 'EDMC' # appversion **MUST** follow Semantic Versioning rules: # # Major.Minor.Patch(-prerelease)(+buildmetadata) -appversion = '4.1.1' #-rc1+a872b5f' +appversion = '4.1.2' #-rc1+a872b5f' # For some things we want appversion without (possible) +build metadata appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' From 5bbeeeee3201d50adecc1b86782a0563812eba71 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 7 Oct 2020 10:12:38 +0100 Subject: [PATCH 3/3] appcast 4.1.2 --- edmarketconnector.xml | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/edmarketconnector.xml b/edmarketconnector.xml index e5723acd..924f5d0a 100644 --- a/edmarketconnector.xml +++ b/edmarketconnector.xml @@ -168,11 +168,35 @@ - Release 4.1.0 + Release 4.1.1 body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; } +

Release 4.1.2

+
    +
  • Minor fix to EDMC.py to revert broken logic trying to detect when there is +neither commodities nor outfitting data for a station.
    • +
+ +

Release 4.1.1

+

This release should get the program running again for everyone who had issues +with 4.1.0.

+
    +
  • +

    Catch any exception when we try to set UTF-8 encoding. We'll log where this +fails but the program should continue running.

    +
    • +
  • +

    The use of the tkinter.filedialog code is now contingent on a UTF-8 +encoding being set. If it isn't then we'll revert to the previous +non-tkinter file dialog code. The older OSes that can't handle a UTF-8 +encoding will get that slightly worse file dialog (that was previously +always the case before 4.1.0). Everyone else gets to enjoy the more up to +date file dialog with all the shortcuts etc.

    +
    • +
+

Release 4.1.0

This release contains the result of a lot of code cleanup on several files and the addition of a proper logging paradigm, which should aid us in tracking @@ -769,11 +793,11 @@ If any of your plugins are listed in that section then they will need updating, ]]>