1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 01:00:42 +03:00

1438 Commits

Author SHA1 Message Date
Athanasius
2416fa6e88
Merge pull request #524 from bgol/bugfix-522
Bugfix #522
2020-06-21 22:21:44 +01:00
Bernd Gollesch
77a2a1b533 Use the after method of root to open the messagebox inside the mainloop (fixes #522). 2020-06-21 22:05:12 +02:00
Athanasius
b829c1bbd1 Remove the 'plugins not py 3.x' warning popup from EDMarketConnector.py
This *was* moved to plug.py, and it executing there prevents this
version from actually causing a popup, but it doesn't belong here.
2020-06-21 20:15:33 +01:00
Athanasius
c5adb3bbb9 Merge branch 'python3' of https://github.com/EDCD/EDMarketConnector into python3 2020-06-21 20:10:22 +01:00
Athanasius
20aaca3bb2 docs: RELEASING: You REALLY need to update that install URL 2020-06-21 19:24:37 +01:00
Athanasius
8d940a8870 We don't need to have the installer log after all. pub-346 2020-06-21 19:21:37 +01:00
Athanasius
52801c762e Merge branch 'releases' of https://github.com/EDCD/EDMarketConnector into releases 2020-06-21 19:16:34 +01:00
Athanasius
e209935f5f Actually change the URL of the release to 346 2020-06-21 19:15:55 +01:00
Athanasius
ba61563e80 Attempt to make installer log verbosely 2020-06-21 19:13:45 +01:00
Athanasius
07af891551 Update sparkle:version to 3.4.6.0
And now 3.46 will actually be fully published.
release-final-python27
2020-06-21 18:32:52 +01:00
Athanasius
3562de9e62 release-346: Finalise changelog
* Document the "Disable Automatic Application Updates Check when
   in-game" option.
 * Add 'dummy' section for 3.45.
final-python27
2020-06-21 18:04:30 +01:00
Athanasius
9be67224c1 Merge branch 'release-final-python27' into release-346 2020-06-21 17:59:32 +01:00
Athanasius
ca4b448ce2 Merge branch 'python3' of https://github.com/EDCD/EDMarketConnector into python3 rel-351-0 2020-06-21 17:19:38 +01:00
Athanasius
558392d21b Move "plugins need migrating" popup to plug.py
Where it was in EDMarketConnector.py caused issues because then the
main thread was blocking on the popup when other threads expected it to
be running:

---------------------------------------------------------------------
Exception in thread Journal worker:
Traceback (most recent call last):
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\threading.py", line 926, in _bootstrap_inner
    self.run()
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\threading.py", line 870, in run
    self._target(*self._args, **self._kwargs)
  File "C:\Users\Athan\Documents\Devel\EDMarketConnector-python3\monitor.py", line 273, in worker
    self.root.event_generate('<<JournalEvent>>', when="tail")
  File "C:\Users\Athan\AppData\Local\Programs\Python\Python37-32\lib\tkinter\__init__.py", line 1673, in event_generate
    self.tk.call(args)
RuntimeError: main thread is not in main loop
---------------------------------------------------------------------

However *now* it pops up before the main UI is running properly at all,
so the EDMC window is likely out of position, and won't be
painted/themed yet.
  This is deemed acceptable for a 'once a day at most' popup.

  The popup title now has 'EDMC: ' at the start to be sure users know
what it's talking about.
  It also has some brief advice about how to disable a plugin.
2020-06-21 17:14:16 +01:00
Athanasius
3178ad1b6f Remove dangling 'imp.release_lock()' that's no longer required 2020-06-21 16:58:50 +01:00
Athanasius
8690f1bb83 Fix old style 'print ' statements 2020-06-21 16:58:21 +01:00
Athanasius
a40b0e33ca Detect plugins without Python 3.x support and warn user.
To allow users to sort out their plugins before EDMC itself moves to
Python 3.x warn them if any of their enabled, non-stock, plugins do not
have a plugin_start3() method.

  * If any are found without support there's a popup triggered at the
    end of AppWindow initialisation.
  * Then the user can check Settings > Plugins to see a list of the
    plugins without Python 3.x support.
2020-06-21 16:57:37 +01:00
Athanasius
259bb3bbd6 Merge branch 'release-final-python27' into python3 2020-06-21 16:43:02 +01:00
Jonathan Harris
32c5cccce4 Fixes another binary versus string issue in collate.py 2020-06-21 16:33:37 +01:00
Jonathan Harris
685fbeccf5 Doc fixes 2020-06-21 16:33:37 +01:00
Jonathan Harris
36477f53ec Refer to released version of py2exe 2020-06-21 16:33:37 +01:00
Jonathan Harris
a41a65a3b0 Release 3.50 beta0 2020-06-21 16:33:36 +01:00
Jonathan Harris
c62d110448 Plugin migration 2020-06-21 16:33:13 +01:00
Jonathan Harris
3fe4454888 Fix for DDE registration 2020-06-21 16:32:09 +01:00
Jonathan Harris
6e8f667daa Fixes for Sparkle & WinSparkle updating 2020-06-21 16:32:08 +01:00
Jonathan Harris
0ef0f017f1 winreg in Python <= 3.7.4 handles REG_MULTI_SZ incorrectly
https://bugs.python.org/issue32587
Partially reverts 5989acd0d3263e54429ff99769ff73a20476d863
2020-06-21 16:31:42 +01:00
Jonathan Harris
d71e3445c7 Allow Windows executable to be invoked from any cwd 2020-06-21 16:31:42 +01:00
Jonathan Harris
9eb4dbd93e getint() should return 0 for unset 2020-06-21 16:31:42 +01:00
Jonathan Harris
4b69a21c89 Update for Python 3 2020-06-21 16:31:42 +01:00
Jonathan Harris
413865e4d1 Packaging cleanups 2020-06-21 16:31:42 +01:00
Jonathan Harris
2abc9cb149 Update eddb database 2020-06-21 16:31:41 +01:00
Jonathan Harris
823f8caf0a Switch to built-in winreg module on Windows 2020-06-21 16:31:41 +01:00
Jonathan Harris
9f456b8261 We don't need to explicitly set REQUESTS_CA_BUNDLE any more 2020-06-21 16:31:41 +01:00
Jonathan Harris
bddbb913a5 Build a standalone app on MacOS 2020-06-21 16:31:41 +01:00
Jonathan Harris
c5daf1d563 Switch to built-in configparser module on Linux 2020-06-21 16:31:41 +01:00
Jonathan Harris
a4f4483d20 Misc fixes for MacOS 2020-06-21 16:31:41 +01:00
Jonathan Harris
4daaed7f0c Fix representation of user-defined errors 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
Jonathan Harris
a2ea9e014c Change ttk import for consistency 2020-06-21 16:28:30 +01:00
Jonathan Harris
68ec5fe0e1 Sync coriolis-data 2020-06-21 16:28:29 +01:00
Athanasius
f21729ceb4 exe: Cull lib/tcl/tzdata from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
b19a54f980 exe: cull lib/tk/msgs/ from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
d2d960c5d3 exe: Cull lib/tk/images/ from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
85b82f46d7 exe: Cull lib/tk/demos/ from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
25b9470b58 exe: Culls lib/tcl/msgs/ from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
f41cb3e295 exe: Culls all lib/tcl/encoding from .wxs 2020-06-21 16:28:29 +01:00
Athanasius
091a7c22d5 Revert "Lowers companion.py holdoff to 10 seconds"
This reverts commit 93c4f85b3c4c25216ec5f5f62754671b9d8d04e2.
2020-06-21 16:28:29 +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