ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 20:00:29 +03:00
Code Issues Projects Releases Wiki Activity
1,188 Commits 16 Branches 276 Tags
Commit Graph

1188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
5dcf27e08e exe: Restore library.zip to .wxs 
I'd only removed this due to accidentally using "zipfile=None" in the
setup.py previously.  So of course I had no library.zip and took it out
of .wxs to suppress file not found errors.
  But without this python won't find the necessary files.
 2019-09-27 11:40:00 +01:00
Athanasius
486c0118b4 exe: Fixes <Feature><ComponentRef ...> where GUID is explicit 2019-09-27 11:39:50 +01:00
Athanasius
49aa53dc45 exe: Successful .msi build! 
*) .wxs <Feature> updated to match the defined Components
  *) That exit() removed from cp37-setup.py so the WiX build runs
 2019-09-27 11:39:32 +01:00
Athanasius
8b388c7b0b exe: .wxs - comment out VCRedist90, as python3.7.exe uses VC140 and things have changed 
Since VS 2015 (either 140 or 141) Windows 10 should rely on the OS to
install VC runtime.  For Windows 8.1 and earlier:

	2. If you build software designed for use on Windows operating
	systems where the Universal CRT is not guaranteed to be
	installed (i.e., Windows 8.1 and below), your software will
	need to depend on the above mentioned Windows Update packages
	to install the Universal CRT.
<https://devblogs.microsoft.com/cppblog/introducing-the-universal-crt/>
 2019-09-27 11:38:42 +01:00
Athanasius
6ed2c76a80 exe: Correct .wxs GUIDs. 
1) Those with specific GUIDs only have them for historical reasons.
  2) They need to keep the same GUID, else the installer will be
  unhappy.
  3) New files should use "*" for a path-based GUID.
 2019-09-27 11:38:30 +01:00
Athanasius
5086fd8e8d exe: We don't need to explicitly set REQUESTS_CA_BUNDLE any more. 2019-09-27 11:36:07 +01:00
Athanasius
5c6a711367 exe: Removes the previous un-setting of TCL_LIBRARY 
This is what was causing py2exe 0.9.3.2's fix for 'import tkinter' to
then fail on .exe run due to unset TCL_LIBRARY.
 2019-09-26 11:45:24 +01:00
Athanasius
b119974eb5 exe: l10n.py removal of un-needed .decode() calls 2019-09-26 11:44:15 +01:00
Athanasius
5279f2122c exe: config.py doesn't need to decode() any more 2019-09-26 11:43:48 +01:00
Athanasius
c741a8eea2 Adjusts subprocess call to work on Windows and Mac. 2019-09-26 11:41:30 +01:00
Athanasius
be036c1547 Updated coriolis data files 2019-09-26 11:41:09 +01:00
Athanasius
1fba99d43f Updated eddb.py & output files after a full run. 2019-09-26 11:40:42 +01:00
Athanasius
3c4d9448dc collate.py can be run stand-alone, update to 'env'-based first line 2019-09-26 11:40:42 +01:00
Athanasius
decadd634e Fixes another binary versus string issue in collate.py 2019-09-26 11:40:42 +01:00
Athanasius
e51b4f5c68 Cleanup of EDMC.py and related code. All flags tested. 
Mostly the usual file-mode versus .encode('utf-8') tweaks, but also
one list() needed around a <dict>.values().
 2019-09-26 11:40:42 +01:00
Athanasius
f91baf8911 EDMC.py: Small fix to exception handling. 
Now stymied on further work due to game patch today and CAPI being
down.
 2019-09-26 11:40:42 +01:00
Athanasius
df987a3a40 Fixes up "EDMC.py -j" for python3 2019-09-26 11:40:42 +01:00
Athanasius
e9931aa348 Initial work on getting the EDMC.py CLI to work under python3 
*) Fix up print usage
  *) cPickle -> cpickle
  *) "EDMC.py -p <cmdr name>" appears to have never been properly
  updated for multi-account support.
 2019-09-26 11:40:42 +01:00
Athanasius
95693edb19 Updates prefs.py for "import tkinter.filedialog" 2019-09-26 11:40:42 +01:00
Athanasius
a2e73fbe90 platform is always just 'linux' under python3 2019-09-26 11:40:42 +01:00
Athanasius
5c59f32d15 Minor cleanup. 2019-09-26 11:40:42 +01:00
Athanasius
acc78d2657 update.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
5e52273896 plugins/edsy.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
a505402d2a plugins/eddb.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
9bfe7134a9 Need to int() a division if passing where an int is required 2019-09-26 11:40:42 +01:00
Athanasius
5341651c83 Updates generation of ships.p and modules.p 
In doing so also fixes up outfitting.py for Int_DroneControl_ResourceSiphon
 2019-09-26 11:40:42 +01:00
Athanasius
6b75fdb34c dashboard.py: Missed de-future'ing old_div 2019-09-26 11:40:42 +01:00
Athanasius
477a460943 theme.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
6aeb22d670 protocol.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
ae16b4f522 plugins/inara.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
e6f88d3bd4 plugins/edsm.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
116fd175d3 plugins/eddn.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
a15311f08f plugins/eddn.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
7e59c4e582 monitor.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
99bc019e14 l10n.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
7e0cd609a6 config.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
b64d59c2e5 dashboard.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
6c2a44e29b companion.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
b0abc3f865 Revert "Switches to .format() for startup code." 
This reverts commit 11194c1374e4e325b523e6a348503dd0bc0d1a6b.
 2019-09-26 11:40:42 +01:00
Athanasius
0b842f6dff EDMarketConnector.py: De-future 2019-09-26 11:40:42 +01:00
Athanasius
c2605c3a91 Switches to .format() for startup code. 2019-09-26 11:40:42 +01:00
Athanasius
24a8a5bce6 Fixes plugins/eddn massaging of economies and prohibited data 2019-09-26 11:40:42 +01:00
Athanasius
e40dc5a4ae Removes problematic .encode('utf-8')'s in companion.py 2019-09-26 11:40:42 +01:00
Athanasius
89df69601d TODO: 'Hotkey' setting works. 
Tested with:

  	NumPad 5 (revealed s/unichr/chr/ issue)
	F1
	Ctrl+Shift+F1
	Shift+Ins
	Shift+Del
 2019-09-26 11:40:42 +01:00
Athanasius
5caf861172 Fixes Trade Dangerous .prices export. 
Confirmed by Snake Man on EDCD Discordin #edmc

Snake Man : looks ok I guess (never done much of these manual imports)

	python3 trade.py import ../Daurtu.Panshin.Terminal.2019-09-12T12.29.27.prices
	NOTE: Import complete: 93 updated items over 1 stations in 1 systems

Snake Man : trade.py market -vv daurtu/panshin command looks fine too. and trade.py run --cap 500 --cr 20m --ly 12 --fr daurtu/pans gives trading results, looks good indeed
 2019-09-26 11:40:42 +01:00
Athanasius
c932bee929 Fixes __debug__ dump/ file writing. 
Similarly to the 'Save Raw Data' fix in 9ccca42b31102fd713b26a7a8223472d364772ab
 2019-09-26 11:40:42 +01:00
Athanasius
07c52ee9ab Fixes File > 'Save Raw Data' 
Another str versus bytes issue.  We *do* need the .encode('utf-8') in
this case, else it will assume Windows cp1252 encoding which then can't
encode some characters.  So we switch to binary file mode instead.
 2019-09-26 11:40:42 +01:00
Athanasius
f1462ef151 Fixes plugins/coriolis.py to appear in settings, and confirms click-through works 
*) Code and imports brought in line with edsy plugin
  *) 'Coriolis' now appears in Settings > Configuration > Shipyard
    dropdown
  *) Confirmed that with this active a valid build opens on coriolis.io
 2019-09-26 11:40:42 +01:00
Athanasius
a4e95d6ac4 Applies "log to file" necessary fix, whether we're forcing it or not. 2019-09-26 11:40:42 +01:00
Athanasius
7be0c76986 Gets plugins/edsy.py working. The usual string vs. bytes shenanigans. 2019-09-26 11:40:42 +01:00