ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-11-02 01:32:38 +03:00
Code Issues Projects Releases Wiki Activity
4,752 Commits 17 Branches 299 Tags
b2b2fcbaf6cacdc72a91e89a693befbf43f8aeab
Commit Graph
114 Commits
Author SHA1 Message Date
Athanasius a55a92c0af py2exe: Make newer setuptools happy via py_modules=[] 
Tested with `+setuptools==62.6.0`, which appears to currently be the latest.
 2022-07-02 15:52:23 +01:00
Athanasius 25e5ed9c14 setup.py: Explicitly package asyncio and multiprocessing 
We always did before, certainly in 5.2.4, so we should continue to do so,
even though newer python and/or py2exe means they're no longer automatically
included in library.zip by py2exe.
 2022-02-15 15:07:04 +00:00
Athanasius 5aa7b98cf6 setup.py: Add util/ to win32 packages 
Currently only `plugins/eddn.py` imports anything from `util/`, and as
the core plugins are dynamically loaded py2exe can't possibly know about this.
So we need to specify it explictly.

Tested with build and install, and also manually checking the resulting
library.zip:

```
0$ unzip -l library.zip | grep 'util/'
    10582  2022-02-01 14:12   urllib3/util/url.pyc
    11221  2022-02-01 14:12   urllib3/util/ssl_.pyc
     3367  2022-02-01 14:12   urllib3/util/connection.pyc
     1031  2022-02-01 14:12   urllib3/util/__init__.pyc
     1266  2022-02-01 14:12   urllib3/util/proxy.pyc
     3394  2022-02-01 14:12   urllib3/util/request.pyc
     8863  2022-02-01 14:12   urllib3/util/timeout.pyc
      986  2022-02-01 14:12   urllib3/util/queue.pyc
     7332  2022-02-01 14:12   urllib3/util/ssltransport.pyc
     1105  2022-02-01 14:12   util/text.pyc
     3015  2022-02-01 14:12   urllib3/util/wait.pyc
      110  2022-02-01 14:12   util/__init__.pyc
    15704  2022-02-01 14:12   urllib3/util/retry.pyc
     2279  2022-02-01 14:12   urllib3/util/response.pyc
```
 2022-02-01 14:14:43 +00:00
Athanasius 77e89a9df1 setup.py: Properly include FDevIDs files 
I have my doubts about the darwin section, but we never package for it
any more, so I'm not going to worry about it now.
 2021-12-17 12:00:49 +00:00
Athanasius bcabd97f4c FDevIDs: Switch code to using FDevIDs/ files 2021-12-17 11:08:14 +00:00
Athanasius ee66b9deb1 WiX: Move EDMarketConnector.wixobj to root directory 
* Don't specify its generation inside dist.win32/
* Specify `-b dist.win32\` to light.exe invocation

Tested with installing resultant .msi over 5.2.3.
 2021-12-07 17:16:21 +00:00
Athanasius a196bfe172 WiX: Autogeneration of EDMarketConnector.wxs fully working 
* Changed config version to 5.3.0-beta2 to be sure during testing.
* Fixed the case on ChangeLog.md in setup.py py2exe config.
* Replaced all TABs with <4 spaces> in wix/template.wxs.
* Now generating the correct Feature tree in the output file.  NB: The
  'RegistryEntries' isn't part of the file Components but still needs to
  be referenced inside <Feature>.
 2021-12-07 16:48:11 +00:00
Athanasius 0af2af344d WiX: Output to final .wxs to expected filename for next stages 2021-12-07 16:18:26 +00:00
Athanasius ff32c299cf WiX: Insertion of heat.exe produced Components now working 2021-12-07 16:16:27 +00:00
Athanasius 6ed64c9d6b WiX: .gitignore components.wxs & add template.wxs 
Also renamed header.wxs to template.wxs in setup.py, as we're going to
insert into the middle of its content, not use it as a simple
concatenated header.
 2021-12-07 15:51:38 +00:00
Athanasius 43394b17ff Initial work on auto-generating WiX Component list 
* We'll be generating EDMarketConnector.wxs, so remove it from git and
  add to .gitignore
* Initial work on using `lxml` to parse in wix/components.wxs, generated
  by heat.exe, to pick out what we need, modify it, and eventually
  stitch into a generated EDMarketConnector.wxs
 2021-12-07 15:27:33 +00:00
Athanasius 3a28945ad5 Python 3.10: Change version number in most of our local files 
The requirements-dev.txt change for py2exe will be in a separate commit.
 2021-12-03 11:17:18 +00:00
Athanasius 4d069cb406 Attempting to re-enable Windows "minimize to system tray" support 
1. It's not actually hiding the task bar icon currently.
2. As this touched prefs.py I've done a flake8 and mypy cleanup pass
   too.  But some of that will want reviewing later as I noqa'd some
   things.
 2021-11-12 13:17:27 +00:00
Athanasius 08499625f5 5.0.0: Include --reset-ui .bat, and mention killswitches docs 2021-05-12 14:41:06 +01:00
Athanasius 3c47b6c782 Fix semantic_version appversion issues in update.py and setup.py 2021-04-01 14:46:43 +01:00
Athanasius fbd94c68aa build: .gitversion in DATA_FILES and installer. 2021-04-01 14:45:52 +01:00
Athanasius 2f9789afdd Update all code to use config.appversion() as a function 
This *also* caught some instances where appversion_nobuild should
already have been used, so those were both changed and updated to a
function call.
 2021-04-01 14:45:52 +01:00
Athanasius cc571e44b1 Re-factor git short hash into a config.py function. 
This should clear the way for using it in running code when not frozen.
 2021-04-01 14:45:52 +01:00
Athanasius 3f3a4f282e app version: Write a .gitversion file with short hash from setup.py 2021-04-01 14:45:52 +01:00
Athanasius c0bf09d974 setup.py: Fix whitespace before comments 2021-04-01 14:45:51 +01:00
Athanasius 8a3176c67d setup.py: Fix win32 OPTIONS formatting 2021-04-01 14:45:51 +01:00
Athanasius bc33bf1b19 Attempt to get develop back to code state before rebase on main. 2021-04-01 14:45:51 +01:00
Athanasius 357f2278b2 Remove last references to, and generation of, systems.p file 
This was the last code in eddb.py, so that has now been removed.

This was historically used by the core EDDB plugin to construct a valid
URL for a given station. EDDB has long-since provided alternate URL
formats that negate the need for this.

Plugin authors have been warned not to use this already.

# Conflicts:
#	setup.py
 2021-04-01 14:45:50 +01:00
Athanasius 09730adbe6 Remove last references to, and generation of, stations.p file. 
This was historically used by the core EDDB plugin to construct a valid
URL for a given station. EDDB has long-since provided alternate URL
formats that negate the need for this.

Plugin authors have been warned not to use this already.
 2021-04-01 14:45:50 +01:00
Athanasius 355d3790d2 build: Now using Python 3.9 
* .msi installs
* .exe in that runs
* Basic tests like 'Update' via CAPI and coriolis ship build work.
* `plugintest` use of shutil and sqlite also works.
 2021-04-01 14:45:49 +01:00
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