Commit Graph
1397 Commits
Author SHA1 Message Date
Athanasius d8a76fd085 Merge branch 'feature/525-common-changelog' into python3 2020-06-28 16:19:20 +01:00
Athanasius c2dc5a62f1 Update RELEASING.md for using full version numbers.
I've also re-done the release actions/order to actually push the
release-A.B.C.D branch up to github, along with the rel-A.B.C.D tag on
its HEAD.  This way the final release step is a merge of release-A.B.C.D
into releases, which could even be done directly on github.
2020-06-28 16:17:14 +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
Athanasius 70a7ef6337 Merge branch 'release-final-python27' into python3 2020-06-27 10:19:59 +01:00
Athanasius 8435f61128 Add some notes on using GitHub API to get changelogs 2020-06-27 01:38:46 +01:00
Athanasius 9d9c688c4b Add ChangeLog.md
This is based on the latest appcast edmarketconnector.xml contents.

  It looks like Marginal was in the habit of clearing it out when major
version bumped.

  Going to need something to retrieve all the prior release notes from
github, starting with rel-100.
2020-06-26 13:25:07 +01:00
Athanasius 4dcdcf5c3f Merge branch 'python3' of https://github.com/EDCD/EDMarketConnector into python3 2020-06-22 00:20:34 +01:00
Athanasius fa9ed8cc81 docs: RELEASING: Update pip/modules requirements
* Confirmed requirements,txt contents work, NB: Need to have already
   installed py2exe as pip won't find a valid version.
 * Document using requirements.txt, now that it's up to date.
 * So that isn't part of the py2exe section now.
2020-06-22 00:18:47 +01:00
Athanasius 65a2c4c1d5 Update requirements.txt
* Removed modules we don't seem to use any more.
  * Went through *all* the imports (including 'from X import Y') and
    checked every module was one of: builtin, stock in win32 python
    3.7.7 or a known dependency of another we do list.
  * As we still have the sqlite3.dll hack in setup.py I've only
    specified: +py2exe>=0.9.3.2
  * certifi==2019.9.11 to work around py2exe issues the current latest
  * keyring==19.2.0 to work around py2exe issues the current latest

This still needs testing to see if it's enough to setup an
only-just-installed Python-32 of 3.7.7
2020-06-21 23:40:16 +01:00
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 5989acd0d3
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