ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'releases'

Browse Source 
Release 3.44 just made as pre-release, soon to be live.
This commit is contained in:
Athanasius 2020-06-17 18:15:33 +01:00
commit 53bbeca12b
9 changed files with 358 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,5 +9,7 @@ dump
*.pdb
*.msi
*.wixobj
*.xml
appcast_win_*.xml
appcast_mac_*.xml
EDMarketConnector.VisualElementsManifest.xml
*.zip

6
EDMarketConnector.py
View File

@ -661,13 +661,13 @@ class AppWindow:
self.w.clipboard_append(monitor.station and '%s,%s' % (monitor.system, monitor.station) or monitor.system)
def help_general(self, event=None):
webbrowser.open('https://github.com/Marginal/EDMarketConnector/wiki')
webbrowser.open('https://github.com/EDCD/EDMarketConnector/wiki')
def help_privacy(self, event=None):
webbrowser.open('https://github.com/Marginal/EDMarketConnector/wiki/Privacy-Policy')
webbrowser.open('https://github.com/EDCD/EDMarketConnector/wiki/Privacy-Policy')
def help_releases(self, event=None):
webbrowser.open('https://github.com/Marginal/EDMarketConnector/releases')
webbrowser.open('https://github.com/EDCD/EDMarketConnector/releases')
def save_raw(self):
self.status['text'] = _('Fetching data...')

13
EDMarketConnector.wxs
View File

@ -11,9 +11,10 @@
Version="$(var.PRODUCTVERSION)"
UpgradeCode="$(var.UPGRADECODE)"
Language="!(bind.fileLanguage.EDMarketConnector.exe)"
Manufacturer="Marginal">
Manufacturer="EDCD">
<Package Id="*" Keywords="Installer"
InstallScope="perMachine"
Description="$(var.PRODUCTLONGNAME) installer"
InstallerVersion="300" Compressed="yes"
Platform="x86"
@ -32,7 +33,7 @@
<!-- For Add/Remove programs -->
<Property Id="ARPPRODUCTICON" Value="EDMarketConnector.exe" />
<Property Id="ARPNOMODIFY" Value="yes" Secure="yes" /> <!-- Remove modify - also set by WixUI_Minimal -->
<Property Id="ARPHELPLINK" Value="https://github.com/Marginal/EDMarketConnector/wiki" />
<Property Id="ARPHELPLINK" Value="https://github.com/EDCD/EDMarketConnector/wiki" />
<!-- Set INSTALLDIR from ARPINSTALLLOCATION if replacing/upgrading -->
<!-- https://wyrdfish.wordpress.com/2012/07/20/msi-writing-guidelines-this-may-be-out-of-date/ -->
@ -64,14 +65,6 @@
</Custom>
</InstallExecuteSequence>
<!-- Merge in C runtime -->
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist90" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" Language="0"/>
</DirectoryRef>
<Feature Id="VCRedist90" Title="Visual C++ 9.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist90"/>
</Feature>
<!-- Launch app after upgrade -->
<Property Id="LAUNCH" Value="yes" />
<CustomAction Id="DoLaunch"

2
PLUGINS.md
View File

@ -251,7 +251,7 @@ If you display localized strings in EDMC's main window you should refresh them i
Translation files should reside in folder named `L10n` inside your plugin's folder. Files must be in macOS/iOS ".strings" format, encoded as UTF-8. You can generate a starting template file for your translations by invoking `l10n.py` in your plugin's folder. This extracts all the translatable strings from Python files in your plugin's folder and places them in a file named `en.template` in the `L10n` folder. Rename this file as `<language_code>.strings` and edit it.
See EDMC's own [`L10n`](https://github.com/Marginal/EDMarketConnector/tree/master/L10n) folder for the list of supported language codes and for example translation files.
See EDMC's own [`L10n`](https://github.com/EDCD/EDMarketConnector/tree/master/L10n) folder for the list of supported language codes and for example translation files.
# Python Package Plugins

2
PRIVACY.md
View File

@ -38,4 +38,4 @@ If you have registered with the [Inara](https://inara.cz/) website this app tran
### Plugins
If you have installed any [plugins](https://github.com/Marginal/EDMarketConnector/wiki/Plugins) this app makes your Commander details available to those plugins.
If you have installed any [plugins](https://github.com/EDCD/EDMarketConnector/wiki/Plugins) this app makes your Commander details available to those plugins.

10
README.md
View File

@ -46,14 +46,14 @@ Installation
Mac:
* Requires Mac OS 10.10 or later.
* Download the `.zip` archive of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
* Download the `.zip` archive of the [latest release](https://github.com/EDCD/EDMarketConnector/releases/latest).
* The zip archive contains the **EDMarketConnector** app - move this app to **Applications** or wherever you want it.
* Double-click on the app to run it.
Windows:
* Requires Windows 7 or later.
* Download the `.msi` package of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
* Download the `.msi` package of the [latest release](https://github.com/EDCD/EDMarketConnector/releases/latest).
* Double-click on it to install.
* Run **Elite Dangerous Market Connector** from the Start Menu or Start Screen.
@ -222,7 +222,7 @@ You'll see a very long cooldown period if your system's time of day changes whil
- Re-start the app.
### Update Error!
The [GitHub server](https://github.com/Marginal/EDMarketConnector/releases/latest) that hosts this app's updates only supports TLS 1.2 and higher. Follow [these](https://help.passageways.com/hc/en-us/articles/115005183226-How-to-enable-TLS-1-2-in-Internet-Explorer-11-and-MS-Edge) instructions to change your Windows settings to disable the [deprecated](https://tools.ietf.org/html/rfc7568) SSL 2.0 and 3.0 protocols and enable TLS 1.2.
The [GitHub server](https://github.com/EDCD/EDMarketConnector/releases/latest) that hosts this app's updates only supports TLS 1.2 and higher. Follow [these](https://help.passageways.com/hc/en-us/articles/115005183226-How-to-enable-TLS-1-2-in-Internet-Explorer-11-and-MS-Edge) instructions to change your Windows settings to disable the [deprecated](https://tools.ietf.org/html/rfc7568) SSL 2.0 and 3.0 protocols and enable TLS 1.2.
### Location of configuration files
If your configuration has been corrupted, or badly set, such that you can't run the program to fix it, or you otherwise need to directly access the configuration then these are the locations of the configuration:
@ -248,7 +248,7 @@ Future updates will also be installed to this location.
This app doesn't work with PS4 or Xbox Elite: Dangerous accounts. On these platforms the game lacks support for the API and Journal files that this app relies on.
### Reporting a problem
Please report a problem as a new GitHub [issue](https://github.com/Marginal/EDMarketConnector/issues/new). Please wait for the error to occur and zip up and attach this app's log file to the new issue:
Please report a problem as a new GitHub [issue](https://github.com/EDCD/EDMarketConnector/issues/new). Please wait for the error to occur and zip up and attach this app's log file to the new issue:
Mac:
@ -262,7 +262,7 @@ Windows:
Running from source
--------
Download and extract the [latest source code](https://github.com/Marginal/EDMarketConnector/archive/master.zip) (or fork and clone if you're comfortable with using `git`).
Download and extract the [latest source code](https://github.com/EDCD/EDMarketConnector/archive/master.zip) (or fork and clone if you're comfortable with using `git`).
Mac:

4
config.py
View File

@ -8,9 +8,9 @@ from sys import platform
appname = 'EDMarketConnector'
applongname = 'E:D Market Connector'
appcmdname = 'EDMC'
appversion = '3.4.3.0'
appversion = '3.4.4.0'
update_feed = 'https://marginal.org.uk/edmarketconnector.xml'
update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'
update_interval = 47*60*60

332
edmarketconnector.xml Normal file
View File

@ -0,0 +1,332 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>E:D Market Connector</title>
<link>https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml</link>
<description>Most recent changes with links to updates.</description>
<!-- Important: Mac must be listed before Windows since Sparkle < 1.18.1 on OSX doesn't check sparkle:os -->
<item>
<title>Release 3.44</title>
<description>
<![CDATA[
<style>h2 { font-size: 105%; }</style>
<h2>Release 3.44</h2>
<p><b>CHANGE OF MAINTAINER</b></p>
<p>Due to a lack of time to give the project the attention it needs Marginal has handed over ownership of the EDMarketConnector GitHub repository to the EDCD (Elite Dangerous Community Developers) organisation.</p>
<p>Initially Athanasius will now be responsible for maintaining the code, including addressing any Pull Requests and Issues, and making releases. <b><u>Unfortunately he has no access to hardware running MacOS so can't easily generate builds for that platform</u> or test them. So for the time being releases will be for Windows 10 only.</b> MacOS users are advised to look into running from source (see the github README).</p>
<p>Going forwards the intention is to move to the python 3.7 code as soon as possible. To facilitate this there will be one more python 2.7 release in addition to this one, with the main aim of that being to add code to alert the user about any plugins they use that have apparently not been updated to run under python 3.7.</p>
<p>See the project GitHub repository's <a href="https://github.com/EDCD/EDMarketConnector/blob/master/README.md">README.md</a> for further information.</p>
<ul>
<li>Version increased to 3.4.4.0 / 3.44.</li>
<li>URL the application checks for updates changed to point to github,</li>
</ul>
<h2>Release 3.44</h2>
<h2>Release 3.43</h2>
<ul>
<li>New commodity and modules from &ldquo;September Update&rdquo;.</li>
<li>Misc fixes.</li>
<li>More control over plugin widget colors.</li>
</ul>
<p>The first time that you run the app while playing the game you are redirected to Frontier's authentication website and prompted for your username and password.</p>
<h2>Release 3.42</h2>
<ul>
<li>Use EDSY.org address for EDShipyard.</li>
<li>Add advanced multi-cannon from &ldquo;Bridging the Gap&rdquo;.</li>
</ul>
<h2>Release 3.41</h2>
<ul>
<li>Transparent theme window size reduced.</li>
</ul>
<h2>Release 3.40</h2>
<ul>
<li>Add new modules in 3.4.</li>
<li>Improved authentication when app started with game already running.</li>
</ul>
<h2>Release 3.38</h2>
<ul>
<li>More authentication fixes.</li>
<li>Send influence and reputation gain to Inara on mission completion.</li>
</ul>
<h2>Release 3.37</h2>
<ul>
<li>More authentication fixes.</li>
<li>More robust/graceful handling of Frontier Auth and/or cAPI server outages.</li>
</ul>
<h2>Release 3.36</h2>
<ul>
<li>Fix for forthcoming Frontier authentication changes.</li>
</ul>
<h2>Release 3.35</h2>
<ul>
<li>Display feedback on successful authentication.</li>
<li>Outfitting and Shipyard data also sent to EDDN on visiting outfitting or shipyard in-game, and tagged with a &ldquo;Horizons&rdquo; flag.</li>
<li>Sends your local faction reputation to Inara.</li>
<li>Fix for preferences window appearance on macOS Mojave.</li>
</ul>
<h2>Release 3.33</h2>
<ul>
<li>More authentication fixes.</li>
</ul>
<h2>Release 3.32</h2>
<ul>
<li>Fix for token expiry during a session (&ldquo;Frontier server is down&rdquo; error).</li>
<li>Force re-authentication if credentials entered for wrong Cmdr.</li>
<li>More logging of OAuth failures.</li>
</ul>
<h2>Release 3.31</h2>
<ul>
<li>Support for OAuth2-based access to station commodity market, outfitting and shipyard data.</li>
<li>Fix for command-line program.</li>
<li>Improved handling of authentication errors.</li>
<li>Commodity market data also sent to EDDN on visiting the in-game commodity market.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.30</h2>
<ul>
<li>Support for OAuth2-based access to station commodity market, outfitting and shipyard data.</li>
<li>Commodity market data also sent to EDDN on visiting the in-game commodity market.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.20</h2>
<ul>
<li>Preliminary support for E:D 3.3.</li>
<li>Support accessing Journal on macOS remotely over SMB.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.12</h2>
<ul>
<li>Fix EDSM support.</li>
<li>Send Coriolis links to <a href="https://coriolis.io/" target="_blank">https://coriolis.io/</a> instead of https://coriolid.edcd.io/. To migrate saved builds see <a href="https://youtu.be/4SvnLcefhtI" target="_blank">https://youtu.be/4SvnLcefhtI</a>.</li>
<li>Plugins: pass plugin's folder location to plugin_start().</li>
</ul>
<h2>Release 3.11</h2>
<ul>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.10</h2>
<ul>
<li>Support for new ships and modules in E:D 3.1.</li>
<li>Fix for sending ship loadouts with engineered modules with certain secondary effects to Inara.</li>
<li>Add separators between plugins in main window.</li>
<li>Chinese (Simplified) translation courtesy of Cmdr Zhixian Wu.</li>
<li>Portuguese (Portugal) translation courtesy of Carlos Oliveira.</li>
</ul>
<h2>Release 3.06</h2>
<ul>
<li>Extend localisation support to plugins.</li>
<li>Hungarian translation courtesy of Cmdr Wormhole.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.05</h2>
<ul>
<li>Fix for &ldquo;Frontier server is down&rdquo; error on systems with primary language other than English.</li>
<li>Fix for TD prices file format.</li>
</ul>
<h2>Release 3.04</h2>
<ul>
<li>Export ship loadout to Coriolis in Journal &ldquo;Loadout&rdquo; format.</li>
<li>Fix for &ldquo;This app requires accurate timestamps&rdquo; error - get timestamps for cAPI-derived data from cAPI server.</li>
<li>Fix for TCE integration.</li>
<li>Support for &ldquo;package plugins&rdquo;.</li>
</ul>
<h2>Release 3.03</h2>
<ul>
<li>Fixes for stats and plugin display.</li>
</ul>
<h2>Release 3.02</h2>
<ul>
<li>Choose between eddb, EDSM and Inara for station and shipyard links.</li>
<li>Don't display &ldquo;Solo&rdquo; mode in main window.</li>
<li>Fix for saving ship loadout to file when ship name contains punctuation.</li>
</ul>
<h2>Release 3.01</h2>
<ul>
<li>Various fixes for EDSM, Inara and TCE integrations.</li>
<li>Fix for failure to terminate cleanly.</li>
<li>Switch ship loadout file to journal format.</li>
</ul>
<h2>Release 3.00</h2>
<ul>
<li>Support for E:D 3.0.</li>
<li>Updates your entire fleet on EDSM and/or Inara whenever you visit the shipyard in game.</li>
<li>Updates your current ship's loadout on EDSM and/or Inara whenever it changes.</li>
<li>Plugin access to your dashboard status.</li>
</ul>
]]>
</description>
<enclosure
url="https://github.com/EDCD/EDMarketConnector/releases/download/rel-344/EDMarketConnector_mac_344.zip"
sparkle:os="macos"
sparkle:version="3.4.4.0"
length="6058091"
type="application/octet-stream"
/>
</item>
<!-- Windows -->
<item>
<title>Release 3.44</title>
<description>
<![CDATA[
<style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
<h2>Release 3.44</h2>
<p><b>CHANGE OF MAINTAINER</b></p>
<p>Due to a lack of time to give the project the attention it needs Marginal has handed over ownership of the EDMarketConnector GitHub repository to the EDCD (Elite Dangerous Community Developers) organisation.</p>
<p>Initially Athanasius will now be responsible for maintaining the code, including addressing any Pull Requests and Issues, and making releases. Unfortunately he has no access to hardware running MacOS so can't easily generate builds for that platform or test them. So for the time being releases will be for Windows 10 only. MacOS users are advised to look into running from source (see the github README).</p>
<p>Going forwards the intention is to move to the python 3.7 code as soon as possible. To facilitate this there will be one more python 2.7 release in addition to this one, with the main aim of that being to add code to alert the user about any plugins they use that have apparently not been updated to run under python 3.7.</p>
<p>See the project GitHub repository's <a href="https://github.com/EDCD/EDMarketConnector/blob/master/README.md">README.md</a> for further information.</p>
<ul>
<li>Version increased to 3.4.4.0 / 3.44.</li>
<li>URL the application checks for updates changed to point to github,</li>
</ul>
<h2>Release 3.43</h2>
<ul>
<li>New commodity and modules from &ldquo;September Update&rdquo;.</li>
<li>Increase transparent theme font size.</li>
<li>Misc fixes.</li>
<li>More control over plugin widget colors.</li>
</ul>
<p>The first time that you run the app while playing the game you are redirected to Frontier's authentication website and prompted for your username and password.</p>
<h2>Release 3.42</h2>
<ul>
<li>Use EDSY.org address for EDShipyard.</li>
<li>Fixes for running under Wine on Linux.</li>
<li>Support not always on top with dark theme on Linux.</li>
<li>Add advanced multi-cannon from &rdquo;Bridging the Gap&rdquo;.</li>
</ul>
<h2>Release 3.41</h2>
<ul>
<li>Transparent theme window size reduced.</li>
</ul>
<h2>Release 3.40</h2>
<ul>
<li>Use Euro Caps font with transparent theme.</li>
<li>Add new modules in 3.4.</li>
<li>Improved authentication when app started with game already running.</li>
</ul>
<h2>Release 3.38</h2>
<ul>
<li>More authentication fixes.</li>
<li>Send influence and reputation gain to Inara on mission completion.</li>
</ul>
<h2>Release 3.37</h2>
<ul>
<li>More authentication fixes.</li>
<li>More robust/graceful handling of Frontier Auth and/or cAPI server outages.</li>
</ul>
<h2>Release 3.36</h2>
<ul>
<li>Fix for forthcoming Frontier authentication changes.</li>
<li>Fix for installation on non-English systems.</li>
</ul>
<h2>Release 3.35</h2>
<ul>
<li>Display feedback on successful authentication.</li>
<li>Outfitting and Shipyard data also sent to EDDN on visiting outfitting or shipyard in-game, and tagged with a &ldquo;Horizons&rdquo; flag.</li>
<li>Sends your local faction reputation to Inara.</li>
</ul>
<p>The first time that you run the app while playing the game you are redirected to Frontier's authentication website and prompted for your username and password.</p>
<h2>Release 3.33</h2>
<ul>
<li>More authentication fixes.</li>
</ul>
<h2>Release 3.32</h2>
<ul>
<li>Fix for token expiry during a session (&ldquo;Frontier server is down&rdquo; error).</li>
<li>Force re-authentication if credentials entered for wrong Cmdr.</li>
<li>More logging of OAuth failures.</li>
</ul>
<h2>Release 3.31</h2>
<ul>
<li>Support for OAuth2-based access to station commodity market, outfitting and shipyard data.</li>
<li>Fix for command-line program.</li>
<li>Improved handling of authentication errors.</li>
<li>Commodity market data also sent to EDDN on visiting the in-game commodity market.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.30</h2>
<ul>
<li>Support for OAuth2-based access to station commodity market, outfitting and shipyard data.</li>
<li>Commodity market data also sent to EDDN on visiting the in-game commodity market.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.20</h2>
<ul>
<li>Preliminary support for E:D 3.3.</li>
<li>Support accessing Journal on macOS remotely over SMB.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.12</h2>
<ul>
<li>Send Coriolis links to <a href="https://coriolis.io/" target="_blank">https://coriolis.io/</a> instead of https://coriolid.edcd.io/. To migrate saved builds see <a href="https://youtu.be/4SvnLcefhtI" target="_blank">https://youtu.be/4SvnLcefhtI</a>.</li>
</ul>
<h2>Release 3.11</h2>
<ul>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.10</h2>
<ul>
<li>Support for new ships and modules in E:D 3.1.</li>
<li>Fix for sending ship loadouts with engineered modules with certain secondary effects to Inara.</li>
<li>Add separators between plugins in main window.</li>
<li>Chinese (Simplified) translation courtesy of Cmdr Zhixian Wu.</li>
<li>Portuguese (Portugal) translation courtesy of Carlos Oliveira.</li>
</ul>
<h2>Release 3.06</h2>
<ul>
<li>Extend localisation support to plugins.</li>
<li>Hungarian translation courtesy of Cmdr Wormhole.</li>
<li>Misc fixes.</li>
</ul>
<h2>Release 3.05</h2>
<ul>
<li>Fix for &ldquo;Frontier server is down&rdquo; error on systems with primary language other than English.</li>
<li>Fix for TD prices file format.</li>
</ul>
<h2>Release 3.04</h2>
<ul>
<li>Export ship loadout to Coriolis in Journal &ldquo;Loadout&rdquo; format.</li>
<li>Fix for &ldquo;This app requires accurate timestamps&rdquo; error - get timestamps for cAPI-derived data from cAPI server.</li>
<li>Fix for TCE integration.</li>
<li>Support for &ldquo;package plugins&rdquo;.</li>
</ul>
<h2>Release 3.03</h2>
<ul>
<li>Fixes for stats and plugin display.</li>
</ul>
<h2>Release 3.02</h2>
<ul>
<li>Choose between eddb, EDSM and Inara for station and shipyard links.</li>
<li>Don't display &ldquo;Solo&rdquo; mode in main window.</li>
<li>Fix for saving ship loadout to file when ship name contains punctuation.</li>
</ul>
<h2>Release 3.01</h2>
<ul>
<li>Various fixes for EDSM, Inara and TCE integrations.</li>
<li>Fix for failure to terminate cleanly.</li>
<li>Switch ship loadout file to journal format.</li>
</ul>
<h2>Release 3.00</h2>
<ul>
<li>Support for E:D 3.0.</li>
<li>Updates your entire fleet on EDSM and/or Inara whenever you visit the shipyard in game.</li>
<li>Updates your current ship's loadout on EDSM and/or Inara whenever it changes.</li>
<li>Plugin access to your dashboard status.</li>
</ul>
]]>
</description>
<enclosure
url="https://github.com/EDCD/EDMarketConnector/releases/download/rel-344/EDMarketConnector_win_344.msi"
sparkle:os="windows"
sparkle:installerArguments="/passive LAUNCH=yes"
sparkle:version="3.4.4.0"
length="10338304"
type="application/octet-stream"
/>
</item>
</channel>
</rss>

16
setup.py
View File

@ -43,8 +43,8 @@ if dist_dir and len(dist_dir)>1 and isdir(dist_dir):
macdeveloperid = None
# Windows paths
WIXPATH = r'C:\Program Files (x86)\WiX Toolset v3.9\bin'
SDKPATH = r'C:\Program Files (x86)\Windows Kits\8.1\bin\x86'
WIXPATH = r'C:\Program Files (x86)\WiX Toolset v3.11\bin'
SDKPATH = r'C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86'
# OSX paths
SPARKLE = '/Library/Frameworks/Sparkle.framework'
@ -95,7 +95,7 @@ if sys.platform=='darwin':
],
'LSMinimumSystemVersion': '10.10',
'NSAppleScriptEnabled': True,
'NSHumanReadableCopyright': u'© 2015-2019 Jonathan Harris',
'NSHumanReadableCopyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'SUEnableAutomaticChecks': True,
'SUShowReleaseNotes': True,
'SUAllowsAutomaticUpdates': False,
@ -147,16 +147,16 @@ setup(
windows = [ {'dest_base': APPNAME,
'script': APP,
'icon_resources': [(0, '%s.ico' % APPNAME)],
'copyright': u'© 2015-2019 Jonathan Harris',
'copyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'name': APPNAME, # WinSparkle
'company_name': 'Marginal', # WinSparkle
'company_name': 'EDCD', # WinSparkle
'other_resources': [(24, 1, open(APPNAME+'.manifest').read())],
} ],
console = [ {'dest_base': APPCMDNAME,
'script': APPCMD,
'copyright': u'© 2015-2019 Jonathan Harris',
'copyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'name': APPNAME,
'company_name': 'Marginal',
'company_name': 'EDCD',
} ],
data_files = DATA_FILES,
options = OPTIONS,
@ -213,7 +213,7 @@ appcast.write('''
\t\t\t\t]]>
\t\t\t</description>
\t\t\t<enclosure
\t\t\t\turl="https://github.com/Marginal/EDMarketConnector/releases/download/rel-{1}/{2}"
\t\t\t\turl="https://github.com/EDCD/EDMarketConnector/releases/download/rel-{1}/{2}"
\t\t\t\tsparkle:os="{3}"
\t\t\t\tsparkle:version="{4}"
\t\t\t\tlength="{5}"