Commit Graph
4404 Commits
Author SHA1 Message Date
Athanasius 4766f817fd Merge pull request #1455 from EDCD/enhancement/1450/eddn-codex-approachsettlement-correction
monitor: Revert state['StarSystem'] addition, it's not needed.
2022-02-11 16:21:18 +00:00
Athanasius 06c385bf0d Merge pull request #1456 from EDCD/fix/1401/inara-current-assets-including-fc-NOCAPI
Inara: Do not update credits from CAPI data
2022-02-11 16:21:02 +00:00
Athanasius dd6c6fbc36 Inara: Do not update credits from CAPI data
CAPI only has the Cmdr wallet value (and loan if applicable), without anything
for 'total assets'.  If we send Inara setCommanderCredits without
`commanderAssets` then Inara makes a bad judgement on it and sets an
incorrect total assets value.

Also:

> Do NOT set credits/assets unless you are absolutely sure they are correct. The journals currently doesn't contain crew wage cuts, so credit gains are very probably off for most of the players. Also, please, do not send each minor credits change, as it will spam player's credits log with unusable data and they won't be most likely very happy about it. It may be good to set credits just on the session start, session end and on the big changes or in hourly intervals.

So, let's just not.
2022-02-11 12:20:06 +00:00
Athanasius 46e914fcec monitor: Revert state['StarSystem'] addition, it's not needed.
We pass `monitor.system` in to `journal_entry()` anyway, so it doesn't need
to be separately in the passed `state`.
2022-02-11 11:57:05 +00:00
Athanasius 69580bf1fd Merge pull request #1454 from EDCD/dependabot/pip/develop/types-requests-2.27.9
build(deps-dev): bump types-requests from 2.27.8 to 2.27.9
2022-02-10 17:34:34 +00:00
dependabot[bot] 5831426eed build(deps-dev): bump types-requests from 2.27.8 to 2.27.9
Bumps [types-requests](https://github.com/python/typeshed) from 2.27.8 to 2.27.9.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-10 17:21:15 +00:00
Athanasius 2d0fd92ebf develop: Bump appversion to 5.3.0-beta11 2022-02-09 16:36:22 +00:00
Athanasius 15288ce6ad Merge pull request #1452 from EDCD/enhancement/1450/eddn-codex-approachsettlement
eddn: approachsettlement/1 implementation
2022-02-09 16:35:57 +00:00
Athanasius 6f0095e5fe eddn: Slightly rationalise passed StarSystem
* Call it system_name in `export_journal_fssdiscoveryscan()`, as `system`
  could be amigbuous.
* Might as well use `system` passed in to `journal_entry()` when calling
  `export_journal_approachsettlement()`.
2022-02-09 16:14:15 +00:00
Athanasius f1ba8ee5e1 eddn: Fix up approachsettlement & adjust other such function signatures
1. We need StarPos (as well as StarSystem)
2. Adding more state tracking in this plugin is misguided.
3. So added it in monitor instead, putting *copies* of data in the
  monitor.state dictionary.
4. So we reference those, but only available in journal_entry() itself, else
  we'd need to pass the whole of `state` in.
5. So instead pass in the bits of `state` only when we need them.
2022-02-09 16:07:16 +00:00
Athanasius 3a0dbb906a eddn: export_journal_approachsettlement() implementation 2022-02-09 15:01:56 +00:00
Athanasius 4f0ecb0289 .pre-commit-config: .mypy.ini sets these options 2022-02-09 14:48:56 +00:00
Athanasius 91c36a5b1a eddn: Change to the ".lower() Journal event name once" paradigm
Also, whilst the *current* code has the 'augment files' handled last in
then if/else tree we shouldn't assume that will always be the case.
So, be paranoid and use different variables for the augment-loaded entry
and its .lower event_name.

'cos you just know one of us will trip up on it later if there's ever some
'finally' code after that conditional tree.
2022-02-09 14:08:36 +00:00
Athanasius d59dc18b1b eddn: make the exclusive nature of 'own schema' events explicit 2022-02-09 13:50:42 +00:00
Athanasius b6b6f995e2 Pre-Release 5.3.0-beta10: appversion and changelog Release/5.3.0-beta10 2022-02-08 16:31:31 +00:00
Athanasius e1ef4f38f8 requirements.txt: Revert semantic_version to 2.8.5
Ref: https://github.com/EDCD/EDMarketConnector/issues/1447
2022-02-08 16:28:50 +00:00
Athanasius dec51c844a Pre-Release 5.3.0-beta9: ChangeLog
* appversion was already -beta9 in `develop`
Release/5.3.0-beta9
2022-02-08 14:42:31 +00:00
Athanasius b74d0478b0 Merge pull request #1445 from EDCD/fix/1378/inara-sync-ranks-onfoot-beta8
Inara: Trigger off 'Progress' for sending setCommanderRankPilot
2022-02-08 14:38:52 +00:00
Athanasius 30e9abb870 Inara: Change the comment for why we're using Progress, not Ranks 2022-02-08 13:34:03 +00:00
Athanasius 22f90e23aa Inara: Trigger off 'Progress' for sending setCommanderRankPilot
Doing so from 'Rank' means the 'Progress' event hadn't happened yet, so of
course we only ever sent all zeroes for progress.

NB: Journal-v32 doc makes *no guarantee* about the order of the events.
  Is it worth trying to be paranoid about that ?  For a 100% new player
  everything would be "all zeroes", so we would likely need to tweak things
  to store `None` as default values, and check for such.
2022-02-08 13:31:00 +00:00
Athanasius 5e47502384 pre-commit: Updated versions & include check-yaml now 2022-02-07 20:41:47 +00:00
Athanasius a4bd35a5c9 Merge pull request #1442 from EDCD/dependabot/pip/develop/semantic-version-2.9.0
build(deps): bump semantic-version from 2.8.5 to 2.9.0
2022-02-07 17:39:22 +00:00
dependabot[bot] 0cb9f10bff build(deps): bump semantic-version from 2.8.5 to 2.9.0
Bumps [semantic-version](https://github.com/rbarrois/python-semanticversion) from 2.8.5 to 2.9.0.
- [Release notes](https://github.com/rbarrois/python-semanticversion/releases)
- [Changelog](https://github.com/rbarrois/python-semanticversion/blob/master/ChangeLog)
- [Commits](https://github.com/rbarrois/python-semanticversion/compare/2.8.5...2.9.0)

---
updated-dependencies:
- dependency-name: semantic-version
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-07 17:38:38 +00:00
Athanasius 6963a24728 github: submodules-update: Port in all the releasehub code & tweak
We want to *check* if there are any changes and only make a branch and add
commits if so.  The upstream code has no option for this, so use it as
a starting point instead.

Specifically this is based on:

https://github.com/releasehub-com/github-action-create-pr-parent-submodule/blob/main/action.yml
aff9d0978a9bbcbc2961d621d5b108c4b46db5e7

* We need 'success' from the *step* to be when there ARE changes, and that
  is in the special github output.
* In order for the whole job *not* to fail in the 'step check_for_changes
  says it failed' case we need it to have `continue-on-error: true`.
2022-02-07 17:31:47 +00:00
Athanasius 3a82965329 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2022-02-07 15:25:51 +00:00
Athanasius c93df877bb github: submodules-update: Actually it's all submodules, not only FDevIDs 2022-02-07 15:25:16 +00:00
Athanasius 56bb1099ac Merge pull request #1441 from EDCD/1807228322
[Auto-generated] Submodule Updates 1807228322
2022-02-07 15:24:56 +00:00
github-actions 25123c32ca updating submodules 2022-02-07 15:19:49 +00:00
Athanasius 3a362d6a10 github: submodules-check: Use GITHUB_SECRET
Perhaps this will be sufficient, if not we'll need to tweak the permissions
*for that token* **for this action**.
2022-02-07 15:18:45 +00:00
Athanasius a77618f762 github: Fix org(/repo) case in submodule-updates.yml 2022-02-07 14:46:53 +00:00
Athanasius 2bf199f129 github: Add submodule-updates workflow
It's time to start tracking `master/head` of coriolis-data, and this should
trigger a PR making that so.
2022-02-07 14:45:00 +00:00
Athanasius 9f0faad041 develop: Bump appversion 2022-02-07 12:02:47 +00:00
Athanasius 9603eb5561 windows-build: Try the checkout in its own uses section Release/5.3.0-beta8 2022-02-07 11:46:24 +00:00
Athanasius ba8b1b08f6 Revert "windows-build: Example of how to use separate jobs"
This reverts commit 9fcb479955.
2022-02-07 11:44:37 +00:00
Athanasius 9fcb479955 windows-build: Example of how to use separate jobs
Example only because I realised this probably won't preserve, e.g. the
checkout, python dependencies, winsparkle unpack etc, across jobs.  Even if
the jobs are serialised by `needs`.

So expect this to get reverted next, it's only for reference.
2022-02-07 11:43:21 +00:00
Athanasius 4b9d1b4f93 windows-build: OK, only one with:, so try submodules first ?
If this doesn't work then it's time to try splitting all of this out
into separate jobs, rather than steps within a job, with dependencies to
ensure it works.
2022-02-07 11:20:09 +00:00
Athanasius 49275d46b1 windows-build: Prehaps *this* is the syntax for submodule ? 2022-02-07 11:13:51 +00:00
Athanasius b7cc75723c windows-build: move submodules: recursive to actions/checkout 2022-02-07 11:08:26 +00:00
Athanasius f93b4b57d1 Pre-Release 5.3.0-beta8: appversion and ChangeLog stub 2022-02-07 09:48:28 +00:00
Athanasius 33cfd84274 windows-build: Try checkout out submodules recursively 2022-02-07 09:46:35 +00:00
Athanasius 8f9bfe9035 Pre-Release 5.3.0-beta7: Built on Ath's machine & maleware false positives Release/5.3.0-beta7 2022-02-05 09:33:08 +00:00
Athanasius edf0393e88 Pre-Release 5.3.0-beta7: Some ChangeLog review/cleanup 2022-02-04 19:41:09 +00:00
Athanasius b960195869 Pre-Release 5.3.0-beta7: ChangeLog pass
* Python 3.10 in more places.
* Re-ordered entries, both into 'Plugin Developers' section, and grouping
  for e.g. Inara, EDDN, "obvious users thing", "less obvious user things".
* Linked to issues where relevant.
2022-02-04 19:41:09 +00:00
Athanasius 5a31e5be55 Pre-Release 5.3.0-beta7: appversion and *first pass* ChangeLog 2022-02-04 19:41:09 +00:00
Athanasius 024d8747f9 Merge pull request #1436 from EDCD/dependabot/pip/develop/pytest-7.0.0
build(deps-dev): bump pytest from 6.2.5 to 7.0.0
2022-02-04 19:40:46 +00:00
Athanasius 1b6f77f18c Merge pull request #1435 from EDCD/dependabot/github_actions/develop/actions/setup-python-2.3.2
build(deps): bump actions/setup-python from 2.3.1 to 2.3.2
2022-02-04 19:40:34 +00:00
dependabot[bot] ef963fc949 build(deps-dev): bump pytest from 6.2.5 to 7.0.0
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.0.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...7.0.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-04 17:06:31 +00:00
dependabot[bot] 8af0f5598b build(deps): bump actions/setup-python from 2.3.1 to 2.3.2
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-04 17:06:20 +00:00
Athanasius 0d1daf3c1a Merge pull request #1434 from EDCD/fix/1395/journal-engineer-mat-use
monitor: Fold 'EngineerCraft' to lower case in event_type comparison
2022-02-04 13:28:34 +00:00
Athanasius f8e0fb3658 monitor: Fold 'EngineerCraft' to lower case in event_type comparison 2022-02-04 12:22:47 +00:00