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

2857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
A_D
328f8c7397 Broke up giant if 2021-04-01 14:45:49 +01:00
A_D
d4cce9ee84 Removed * Imports 2021-04-01 14:45:49 +01:00
A_D
47d5dce6fe Autoformatted code 2021-04-01 14:45:49 +01:00
Athanasius
64f090487e Need from config import appname else DDE ctypes code fails 2021-04-01 14:45:49 +01:00
Athanasius
d656354a9a Releasing.md: Document necessary updates when changing Python version 2021-04-01 14:45:49 +01:00
Athanasius
31da53200b Bump python version in the github windows build workflow 2021-04-01 14:45:49 +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
Athanasius
851c4f0c7e Update config.get() calls to config.get_str() 
# Conflicts:
#	monitor.py
 2021-04-01 14:45:49 +01:00
Athanasius
55ee4485d1 Implement retry of locking when journal dir changed. 
In case the user does have another EDMC instance running that they need
to kill first.

# Conflicts:
#	monitor.py
 2021-04-01 14:45:49 +01:00
Athanasius
0cb0701ca8 Implement releasing of monitor.JournalLock() 
* Implement JournalLock.release_lock().
* Renamed other methods to remove journaldir_ prefix.
* Slightly tweak the code flow for obtaining the lock.
* Implement JournalLock.update_lock(), called from AppWindow.postprefs().

# Conflicts:
#	EDMarketConnector.py
 2021-04-01 14:45:49 +01:00
Athanasius
b3959cb8d2 Move journal locking code into new monitor.JournalLock class 2021-04-01 14:45:49 +01:00
Athanasius
471714f149 Bump version for develop to 4.3.0-beta1 
Work against stable/main is going to be using 4.2.0-beta1 shortly.
 2021-04-01 14:45:49 +01:00
dependabot[bot]
8c83625592 Bump coverage[toml] from 5.4 to 5.5 
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 5.4 to 5.5.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.4...coverage-5.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
49cc2b4f0d Bump watchdog from 2.0.1 to 2.0.2 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
2abd3e825d Bump mypy from 0.800 to 0.812 
Bumps [mypy](https://github.com/python/mypy) from 0.800 to 0.812.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.800...v0.812)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
f18a18f7dd Bump py2exe from 0.10.2.0 to 0.10.2.1 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.2.0 to 0.10.2.1.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.10.2.0...v0.10.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
ce5a586ed0 Bump watchdog from 2.0.0 to 2.0.1 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
b24b4ce675 Bump watchdog from 1.0.2 to 2.0.0 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 1.0.2 to 2.0.0.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v1.0.2...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
03c2e6a26c Bump autopep8 from 1.5.4 to 1.5.5 
Bumps [autopep8](https://github.com/hhatto/autopep8) from 1.5.4 to 1.5.5.
- [Release notes](https://github.com/hhatto/autopep8/releases)
- [Commits](https://github.com/hhatto/autopep8/compare/v1.5.4...v1.5.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
f4d261d5b2 Bump flake8-noqa from 1.0.5 to 1.1.0 
Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.0.5 to 1.1.0.
- [Release notes](https://github.com/plinss/flake8-noqa/releases)
- [Commits](https://github.com/plinss/flake8-noqa/compare/v1.0.5...v1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
Athanasius
5093fb58ee Add --force-localserver-for-auth CL arg to EDMarketConnector 2021-04-01 14:45:49 +01:00
Athanasius
409e851840 Port in the journals_dir locking and other changes 
* Use a lock file in the journals_dir location to prevent more than one
  instance running against the same journals.  We no longer check just
  for a Windows handle.  So this is more correct on win32 *and* is now a
  thing on all other platforms.
* Adds `--suppress-dupe-process-popup` CL arg to suppress "we're a
  dupe!" popup to aid those using batch files to launch EDMC alongside
  the game.
* Two minor fixups of typos in PLUGINS.md.
* Misc noqa comments and other flake8 fixups.  We're now only missing
  type annotations in EDMarketConnector.py.

# Conflicts:
#	EDMarketConnector.py
 2021-04-01 14:45:49 +01:00
dependabot[bot]
8b70ae7027 Bump coverage[toml] from 5.3.1 to 5.4 
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 5.3.1 to 5.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.3.1...coverage-5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
ba85df78de Bump pytest from 6.2.1 to 6.2.2 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
588fd7a717 Bump py2exe from 0.10.1.0 to 0.10.2.0 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.1.0 to 0.10.2.0.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.10.1.0...v0.10.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
e304d63713 Bump mypy from 0.790 to 0.800 
Bumps [mypy](https://github.com/python/mypy) from 0.790 to 0.800.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.790...v0.800)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
77a20fd575 Bump pytest-cov from 2.11.0 to 2.11.1 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases)
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.11.0...v2.11.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
1b0345436b Bump flake8-json from 20.12.1 to 21.1.0 
Bumps [flake8-json](https://gitlab.com/pycqa/flake8-json) from 20.12.1 to 21.1.0.
- [Release notes](https://gitlab.com/pycqa/flake8-json/tags)
- [Commits](https://gitlab.com/pycqa/flake8-json/compare/20.12.1...21.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
3f88f1af5b Bump safety from 1.10.2 to 1.10.3 
Bumps [safety](https://github.com/pyupio/safety) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/pyupio/safety/releases)
- [Changelog](https://github.com/pyupio/safety/blob/master/HISTORY.rst)
- [Commits](https://github.com/pyupio/safety/compare/1.10.2...1.10.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
e12a2724c5 Bump pytest-cov from 2.10.1 to 2.11.0 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases)
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.10.1...v2.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:49 +01:00
dependabot[bot]
a9e18b6e08 Bump flake8-annotations-coverage from 0.0.4 to 0.0.5 
Bumps [flake8-annotations-coverage](https://github.com/best-doctor/flake8-annotations-coverage) from 0.0.4 to 0.0.5.
- [Release notes](https://github.com/best-doctor/flake8-annotations-coverage/releases)
- [Commits](https://github.com/best-doctor/flake8-annotations-coverage/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:48 +01:00
A_D
3ac956dcec Removed uneeded str() calls 2021-04-01 14:45:48 +01:00
A_D
051245cf90 Renamed various config values to be backwards compatible 2021-04-01 14:45:48 +01:00
Athanasius
f38b2aa95e Revert testing 'True or' on console redirect 2021-04-01 14:45:48 +01:00
Athanasius
2ec767405f Move the 'duplicate' constants into a new constants.py 
1. So now they're only defined in one place.
2. config.py does an import of them, and `from config import ...` then
   chains through, so no need to update other users.
3. No need to ' # noqa E402' the killswitch/config imports now.
 2021-04-01 14:45:48 +01:00
Athanasius
9fcaee9c88 "Is there already a process?" check now works 
1. Moved the rest of the __main__ code so it's all in one block again.
2. Duplicate defined applongname, and protocolhandler.redirect as
   protocolhandler_redirect so that the process checking works.
 2021-04-01 14:45:48 +01:00
Athanasius
ce45a4d405 Fix console redirect to work with config.py now using logging. 
1. We were now importing from config before the console redirect code
   runs.
2. That means that config.py's `logger = logging.getLogger(appname)`
   caused the logger to be set up whilst stdout/err were still pointing
   at the console.
3. So the redirect then had no effect on logging output.

This commit moves the import from config (and also killswitch, because
it also imports logging) to after the *moved* console redirect code.

NB: This needs the "detected a process already running" instance
checking.

NB: There's still a `True or ` for testing purposes EDMarketConnector.py:25

# Conflicts:
#	EDMarketConnector.py
 2021-04-01 14:45:48 +01:00
dependabot[bot]
762ceda73f Bump watchdog from 0.10.3 to 1.0.2 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 0.10.3 to 1.0.2.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v0.10.3...v1.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 14:45:48 +01:00
Athanasius
cd909329af requirements: Change all specified versions to '==' 
Although the issue we've identified with GitHub builds isn't to do with
a python module version it's best to nail precise versions so we can be
sure it will build with the same as we've tested locally.
 2021-04-01 14:45:48 +01:00
Athanasius
b7094c59f3 config: __in_shutdown needs to be abstract member, not self. ? 2021-04-01 14:45:48 +01:00
Athanasius
104f215732 protocol.py: Need from config import config 2021-04-01 14:45:48 +01:00
Athanasius
a8aab186bf config: Update some 'callers' of config.shutting_down for it being a property 2021-04-01 14:45:48 +01:00
Athanasius
3ed08f0f7e plugins/inara: Avoid Tk event_generate() calls during shutdown 
# Conflicts:
#	plugins/inara.py
 2021-04-01 14:45:48 +01:00
Athanasius
db48b6eaad plugins/edsm: Avoid Tk event_generate() calls during shutdown 
# Conflicts:
#	plugins/edsm.py
 2021-04-01 14:45:48 +01:00
Athanasius
e7a7314c1a protocol: Avoid Tk event_generate() calls during shutdown 
# Conflicts:
#	protocol.py
 2021-04-01 14:45:48 +01:00
Athanasius
b39cc7974e hotkey: Avoid event_generate() calls during shutdown 
# Conflicts:
#	hotkey.py
 2021-04-01 14:45:48 +01:00
Athanasius
608a336bb3 dashboard: Bail early from process() if in shutdown 
# Conflicts:
#	dashboard.py
 2021-04-01 14:45:48 +01:00
Athanasius
28a230b584 config: Change self.in_shutdown to be mangled. 
I specifically made set_shutdown() *not* take an argument and only ever
set this true so no-one else can monkey with it, so might as well mangle
it too.
 2021-04-01 14:45:48 +01:00
Athanasius
719a58cbe9 plug.py: Avoid Tk event_generate() call from show_error() if in shutdown 
# Conflicts:
#	plug.py
 2021-04-01 14:45:48 +01:00
Athanasius
2459c40c48 EDMarketConnector: call config.set_shutdown() in AppWindow.onexit() 2021-04-01 14:45:48 +01:00