1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00

89 Commits

Author SHA1 Message Date
A_D
d847fb8bc1 Removed appcast, only upload msi installer 2021-04-01 14:45:45 +01:00
Athanasius
6c9045ba13 setup.py: Convert to rf'' strings, no need to escape backslashes. 2021-04-01 14:45:43 +01:00
Athanasius
550ee394e3 setup.py: Convert one f-string to rf-string. 2021-04-01 14:45:43 +01:00
Athanasius
1297ba9c0d setup.py: typing cleanups
* I didn't go looking for darwin 'py2app' docs to find the possible
  return types of py2app.recipes['member']['check'], so 'Any' will have
  to do.

* re.search may return None, which then doesn't have .group(), so mypy
  complains.  Just tell it to ignore that code.
2021-04-01 14:45:43 +01:00
Athanasius
a8313e3661 setup.py: Reformat appcast style multi-line 2021-04-01 14:45:43 +01:00
Athanasius
54f797ada8 setup.py: No need to manually include sqlite3.dll now 2021-04-01 14:45:43 +01:00
Athanasius
44bea3468d setup.py: Trial without naming requests in packages. 2021-04-01 14:45:43 +01:00
Athanasius
9177f9e229 setup.py: Check python version at start 2021-04-01 14:45:43 +01:00
Athanasius
e999dd6800 setup.py: appcast file & PKG -> package_filename rename 2021-04-01 14:45:43 +01:00
Athanasius
f3433382c3 setup.py: Formatting in win32 packaging. 2021-04-01 14:45:43 +01:00
Athanasius
a013ad19ba setup.py: Format darwin packaging code. 2021-04-01 14:45:42 +01:00
Athanasius
f7d18c12df setup.py: Rename BASEappversion -> base_appversion. 2021-04-01 14:45:42 +01:00
Athanasius
697fcf83ef setup.py: Format setup() call. 2021-04-01 14:45:42 +01:00
Athanasius
03c97299c4 setup.py: win32 OPTIONS and DATA_FILES formatting 2021-04-01 14:45:42 +01:00
Athanasius
b417745e7e setup.py: darwin OPTIONS & misc formatting 2021-04-01 14:45:42 +01:00
Athanasius
bc5f805b5a setup.py: isorted imports & de-caps config variables
* Test build exhibited no issues.
2021-04-01 14:45:42 +01:00
Athanasius
41cb4c24ce setup.py: Bump SDKPATH to use 19041 (Windows 10 2004) Kit. 2021-04-01 14:45:42 +01:00
Athanasius
161ccc04b1 setup.py: No need to manually include sqlite3.dll now 2021-04-01 14:45:11 +01:00
Athanasius
3598a529d1 setup.py: Trial without naming requests in packages. 2021-04-01 14:45:11 +01:00
Athanasius
2e9f37cef2 Add new .bat file to build/install. 2021-03-18 11:39:45 +00:00
A_D
3a0da6dadc
Added missing newline 2020-12-08 18:53:23 +02:00
A_D
033a3bb4da
Removed appcast, only upload msi installer 2020-12-08 18:51:00 +02:00
Athanasius
e515c5b3e0 setup.py: Check we're running under Python 3.7.x 2020-10-08 14:20:03 +01:00
Athanasius
c45c6cda58 setup.py: Add EDMarketConnector - TRACE.bat to data files. 2020-09-28 13:12:58 +01:00
Athanasius
9e1ffc14c8 setup.py: Reference EDMC.manifest ready for its creation
We'll want to do the same "use the UTF-8 codepage" thing here.
2020-09-22 14:54:39 +01:00
Athanasius
717253e7fa setup.py: Add 'dataclasses' and 'timeout_session'
These are needed for latest inara.py plugin code.
2020-09-07 18:02:06 +01:00
A_D
8483b04923 Removed keyring dependency
This remove all dependencies on the keyring lib, updates the
requirements.txt to reflect that, and ensures that setup.py does not
attempt to package it.

Any use of the "old" keyring code will now return None and warn about
its deprecation.
2020-07-30 08:52:07 +01:00
Athanasius
560ac5f81a Semantic Version support: py2exe & WinSparkle
* py2exe only supports Major.Minor.Patch(.Revision), so pass only
Major.Minor.Patch to it.  'File version' of generated EXEs will have
a `.0` appended as .Revision.

* Set 'product_version' in py2exe with the full version string.  This
ends up in the EXE 'Product version' property.

* WinSparkle accidentally suppoorts semver -prerelease correctly, but
not +buildmetadata.  So trim the latter off and set that as the version
for checks.
2020-07-19 11:45:06 +01:00
Athanasius
7e888f5924 Add Changelog.md to distributed files. 2020-07-13 12:30:48 +01:00
Athanasius
3b233771ff setup.py: Use APPNAME, not APP, for product_name
'product_name' is used by WinSparkle to determine the Registry path it uses.   APP is
'EDMarketConnector.py' not the 'EDMarketConnector' that APPNAME is.  This having changed
causes a new popup from WinSparkle on first run of post-3.46 asking about whether to enable
auto update checks.

3.99.0.0 testers will gave to put up with it on first run.
2020-07-01 18:14:17 +01:00
Athanasius
314fc7082d Implements 'Help > About' menu item
* Re-uses the 'About {APP}' that was defined because the MacOS version
   always had an 'About' bit.
 * As a side effect of wanting the copyright string in the popup this is
   now defined in config.py, and setup.py has been adjusted to also take
   it from there.
 * The About popup includes a link to the release notes, contingent on
   the git tag existing on github.
 * Only one instance of the popup is allowed at once.
 * There's still a 'TODO' for moving 'Check for updates' into this
   popup.

Addresses issue #509
2020-07-01 15:44:20 +01:00
Athanasius
e4eb86d3b5 Switch setup.py over to using full version string throughout.
* .msi filename now uses full A.B.C.D version
 * Git tag is assumed to be rel-A.B.C.D

Switched the entire appcast.write() formatting to using named tags, no
need to remember positions now.

Addresses part of #523
2020-06-28 15:52:32 +01:00
Jonathan Harris
6e8f667daa Fixes for Sparkle & WinSparkle updating 2020-06-21 16:32:08 +01:00
Jonathan Harris
413865e4d1 Packaging cleanups 2020-06-21 16:31:42 +01:00
Jonathan Harris
bddbb913a5 Build a standalone app on MacOS 2020-06-21 16:31:41 +01:00
Jonathan Harris
14ed4bd888 Revert some non-Python3 related changes 2020-06-21 16:31:40 +01:00
Jonathan Harris
3c46e8d5fa All executable files invoked with #!/usr/bin/env python3 2020-06-21 16:28:30 +01:00
Athanasius
5560cb9ec6 exe: Updating setup.py with minimal changes to work under py2exe 0.9.3.2 2020-06-21 16:28:09 +01:00
Athanasius
1f1946f80d Force inclusion of sqlite3.dll
*) There's a bug in py2exe meaning sqlite3.dll doesn't get pulled in
    by listing it in packages.  So we fudge it, assuming it's in
    <sys.base_prefix>/DLLs/sqlite3.dll (which is the case for Python 3.2
    32-bit on Windows).

    Bug report filed:

    	<https://github.com/albertosottile/py2exe/issues/23>

  *) Adds sqlite3.dll back into .wxs file
2020-06-21 16:24:15 +01:00
Athanasius
cc9779f4c2 Changes additional copyright from 'Athanasius' to 'EDCD'.
Spansh confirmed this was OK on EDCD Discord.
2020-06-17 17:14:34 +01:00
Athanasius
4ee1510862 Updates build config for EDCD, tweaked copyright, and latest WiX
* Change instances of 'Marginal' to 'EDCD'.  Including github URLs.
  * Update SDKPATH and WIXPATH to the latest versions.
  * Removes un-necessary attempt at including VCredist file.  This isn't
    needed on any Windows 10 version that is vaguely current (tested on
    1909).
  * Adds the following to the EDMarketConnector.wxs <Product Id ...>
    section so that any new version definitely replaces any older one:

    	InstallScope="perMachine"

    without this it defaults to a per-user install, and you end up with
    the prior Marginal-era EDMC allegedly still installed as well, even
    though they're installed into the same path.
    See commit 1beca864d362625f983cc9465125124ffada4ae2 in the python3
    branch.
  * Appends ", 2020 Athanasius" to the copyright notices in setup.py.
    This will likely change to ", 2020 EDCD" pending EDCD Council
    approval.
2020-06-17 16:42:17 +01:00
Jonathan Harris
478cee5c6a Update copyright dates 2019-05-02 00:08:40 +01:00
Jonathan Harris
3b321df6b0 Use "Euro Caps" font with transparent theme
Addresses #412
2019-04-07 14:56:58 +01:00
Jonathan Harris
4afeaccfdc Less verbose 2019-01-10 14:14:06 +00:00
Jonathan Harris
f17f5d3f25 PKCE OAuth2 access to cAPI 2018-12-28 03:32:26 +00:00
Jonathan Harris
cc4390de49 Switch EDDN integration to a plugin 2018-11-18 01:52:05 +00:00
Jonathan Harris
8c01c580a0 Release 3.11 2018-08-02 20:20:08 +01:00
Jonathan Harris
6bffcf473e Also fixup rare commodities 2018-08-01 00:23:47 +01:00
Jonathan Harris
0eaa61bdd9 Make system and station info websites configurable 2018-04-03 01:03:07 +01:00
Jonathan Harris
3add73a496 Use correct sparkle:os value on macOS for Sparkle>=1.18.1 2018-03-01 02:57:54 +00:00