Athanasius
f36d45d4bc
Contributing: Add section on text formatting / .editorconfig
2022-01-27 16:36:41 +00:00
Athanasius
0d68c454a5
Add .editorconfig
...
* The settings are for all file types, we might have some exceptions, i.e.
.xml files.
* This is based on what we've been doing all along. Only the max line length
has previously been codified in, e.g. pyproject.toml. We've not even
codified things like "4-space indentations, expanded from TABs" in
Contributing.md.
2022-01-27 16:28:43 +00:00
Athanasius
5e612d56b3
Merge pull request #1411 from A-UNDERSCORE-D/sys-plaform-mypy
...
Ensure that platform guards are recognised by mypy
2022-01-27 12:58:26 +00:00
Athanasius
055254d323
Merge pull request #1416 from EDCD/fix/navroute-retry-spam-on-startup-scan
...
monitor: Gate navroute on *not* being in journal catch up mode
2022-01-27 12:55:51 +00:00
Athanasius
b678d078b4
Merge pull request #1415 from EDCD/dependabot/pip/develop/coverage-toml--6.3
...
build(deps-dev): bump coverage[toml] from 6.2 to 6.3
2022-01-27 12:54:59 +00:00
A_D
8c2a0ae95a
make tests not explode on windows
2022-01-26 20:37:10 +02:00
Athanasius
3a4690d292
monitor: Gate navroute on *not* being in journal catch up mode
...
We can't just use `EDLogs.live` here as it'll get set `true` when the
`Commander` event is seen *during the catch up*. We need that catchup
to have finished before we'll try processing a `NavRoute` event and
file.
2022-01-26 17:29:29 +00:00
dependabot[bot]
f753ce4308
build(deps-dev): bump coverage[toml] from 6.2 to 6.3
...
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy ) from 6.2 to 6.3.
- [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/6.2...6.3 )
---
updated-dependencies:
- dependency-name: coverage[toml]
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-26 17:03:23 +00:00
A_D
7bcf3a6f4d
note sys.platform requirements in contributing
2022-01-26 18:51:50 +02:00
A_D
f160acfe57
add configs for switching platforms
2022-01-26 18:51:49 +02:00
A_D
bff6175ee7
Update to use sys.platform over platform
2022-01-26 18:51:49 +02:00
A_D
86292e02e2
Move config to module, separate out implementation
...
Does what it says on the tin. Moves config implementations out to
individual files, guards those around platforms to make stuff more
reasonably split out.
2022-01-26 18:51:49 +02:00
A_D
eb28a3b502
Use sys.platform, minor type updates
2022-01-26 18:51:41 +02:00
Athanasius
a5317e984f
Merge pull request #1412 from EDCD/fix/1378/inara-sync-ranks-onfoot
...
Inara: send setCommanderRankPilot message when on-foot
2022-01-26 16:43:17 +00:00
Athanasius
e98aec0169
monitor: Comment what MAX_NAVROUTE_DISCREPANCY is
...
So as to disambiguate from "some discrepancy within the route data".
2022-01-26 16:38:01 +00:00
Athanasius
cfb77944c2
Merge pull request #1410 from A-UNDERSCORE-D/fix/1348/NavRoute-Attempt-to-handle-delayed/old-NavRoutejson-files
...
Retry parsing navroute after failure
2022-01-26 16:37:22 +00:00
A_D
62a0a96dc6
resolve final review comments
2022-01-26 17:42:50 +02:00
A_D
36ecb69964
refactor to use retry function for all attempts at navroute
2022-01-26 13:17:27 +02:00
A_D
06d4842da2
Be more parinoid about navroute files
2022-01-25 20:17:05 +02:00
A_D
d4c6cd94fe
retry navroute parsing after failure
2022-01-25 20:17:04 +02:00
Athanasius
0c938bddfc
Inara: API stated to not support compression
2022-01-25 17:43:04 +00:00
Athanasius
5b80ffbb90
Merge pull request #1414 from A-UNDERSCORE-D/fix/1369/Status-window-missing-Odyssey-ranks-of-Mercenary-and-Exobiology
...
Add Odyssey ranks to status page
2022-01-25 17:26:50 +00:00
A_D
ddcb5219b4
fix mercenary rank, add some comments
2022-01-25 19:23:22 +02:00
A_D
2a4199e098
de-magic-number row splitting
2022-01-25 19:13:32 +02:00
A_D
cf4c2d18f1
silence flake8 N806
2022-01-25 18:54:42 +02:00
A_D
046c07e89c
add Elite I-V
2022-01-25 18:43:04 +02:00
A_D
1f9f7d45f9
update lang
2022-01-25 17:48:56 +02:00
A_D
626fb0cb87
add odyssey ranks to status page
2022-01-25 17:39:44 +02:00
Athanasius
28cbd6e0ea
Inara: queue 'Rank'/'setCommanderRankPilot' as soon as seen
...
This means we *will* send a message when logging in on foot, rather than
waiting for a `Cargo` event that never arrives.
2022-01-25 15:27:35 +00:00
Athanasius
ded86c2ff5
inara: Rename to current_credentials to avoid 'creds' ambiguity
...
Every time I see `current_creds` my first though is "creds means
credits".
2022-01-25 15:00:33 +00:00
Athanasius
c4f734734e
inara: snake_case lastcredits variable
2022-01-25 14:59:53 +00:00
Athanasius
109f964fc3
Python: Version must be a quoted string now
...
Else `3.10` gets interpreted as `3.1` and it all breaks.
2022-01-25 14:30:58 +00:00
Athanasius
eb0ff31805
Python: Bump minor version in GH workflows & update Releasing.md
...
I used Releasing.md as reference for what would need the version
updating, but it didn't say anything about all the workflows, it now
does.
2022-01-25 14:26:42 +00:00
Athanasius
d6be32f7c9
Merge pull request #1408 from EDCD/fix/1401/inara-current-assets-including-fc
...
inara: Utilise Statistics Current_Wealth for commanderAssets
2022-01-20 18:14:42 +00:00
Athanasius
7ac248be7a
inara: Utilise Statistics Current_Wealth for commanderAssets
...
Inara itself seems to be doing this if it has access to CAPI-sourced
Journals. If we don't send commanderAssets as part of
setCommanderCredits then it does ... something else ... and ends up with
your total assets value bouncing between what EDMC is causing and what
it sees from the CAPI-sourced journals.
So, don't send this from LoadGame any more, instead wait for Statistics,
and if it has the relevant data, also send commanderAssets.
2022-01-20 17:45:23 +00:00
Athanasius
333b84ada6
EDMCLogging: Fix minor MAGIC comment format issue
2022-01-20 14:59:46 +00:00
Athanasius
251f129774
EDMCLogging: Reword/format the 'UTC please' MAGIC comments
2022-01-20 14:58:06 +00:00
Athanasius
b9906a96fb
Merge pull request #1407 from A-UNDERSCORE-D/fix/1398/Enforce-all-logging-to-be-in-UTC
...
Switch logging times to be in UTC
2022-01-20 14:54:21 +00:00
A_D
71261fc3d9
Reorder and clarify some comments
2022-01-20 16:49:38 +02:00
A_D
3b4f6a4e85
switch comments to MAGIC tags
2022-01-20 16:41:18 +02:00
A_D
5f007b3f77
more clarifying logs
2022-01-20 16:32:36 +02:00
A_D
66a212f7c4
move UTC to hardcoded, add comment
2022-01-20 16:26:04 +02:00
Athanasius
3cb2c23257
Merge pull request #1404 from A-UNDERSCORE-D/fix/1155/Include-geometry-window-position-in---reset-ui
...
Reset geometry and UI scale with --reset-ui
2022-01-20 14:08:43 +00:00
A_D
7bb060f32c
dont explode if a key doesnt exist when resetting
2022-01-20 16:02:23 +02:00
A_D
cd81f65ed7
Reset geometry and UI scale with --reset-ui
2022-01-20 15:59:51 +02:00
A_D
85f7bddef0
use gmtime as time formatter
2022-01-20 15:52:44 +02:00
Athanasius
f2e38afc39
Merge pull request #1405 from EDCD/enhancement/python-3.10.2
...
Python: bump version used to 3.10.2
2022-01-20 13:39:21 +00:00
Athanasius
dfa8051f42
python: Bump to 3.10.2
...
Confirmed working with a build+run. CAPI update works, Inara plugin
works, Settings open without issues....
2022-01-20 13:32:01 +00:00
Athanasius
2e50f357ee
config.py: Bump to 5.3.0-beta4 to ensure I'm testing 3.10.2 build
2022-01-20 13:28:47 +00:00
Athanasius
cb1bd5a08f
Merge pull request #1402 from EDCD/dependabot/pip/develop/types-requests-2.27.7
...
build(deps-dev): bump types-requests from 2.27.6 to 2.27.7
2022-01-14 17:12:21 +00:00
