Commit Graph
4487 Commits
Author SHA1 Message Date
Athanasius 748043b224 Release 5.3.0: appcast 2022-02-15 18:47:31 +00:00
Athanasius 612df7f098 Merge branch 'stable' into releases 2022-02-15 18:32:24 +00:00
Athanasius f0126dd10b Re-remove: *.csv as they're now used from FDevIDs submodule
`develop` never got the 5.2.4 updates to the files, and then that causedd
a merge conflict into `main`.  This is tidying things up.
2022-02-15 15:56:05 +00:00
Athanasius 173300c45c Merge branch 'beta' 2022-02-15 15:55:05 +00:00
Athanasius e6c3421365 Release 5.3.0: ChanegLog: Oops, translations Release/5.3.0 2022-02-15 15:17:44 +00:00
Athanasius d13cf73688 l10n: Updated translations from OneSky 2022-02-15 15:17:06 +00:00
Athanasius 5d685f3f39 Release 5.3.0: appversion & ChangeLog 2022-02-15 15:09:39 +00:00
Athanasius 25e5ed9c14 setup.py: Explicitly package asyncio and multiprocessing
We always did before, certainly in 5.2.4, so we should continue to do so,
even though newer python and/or py2exe means they're no longer automatically
included in library.zip by py2exe.
2022-02-15 15:07:04 +00:00
Athanasius e152372b3a ChangeLog: Fix 'EDND' tyops 2022-02-15 14:25:26 +00:00
Athanasius 63052142c1 ChangeLog: Don't lose the 5.2.4 section 2022-02-14 17:46:55 +00:00
Athanasius 893a6b243a develop: Bump appversion 2022-02-13 15:36:01 +00:00
Athanasius 6414f7c48a Pre-Release 5.3.0-beta11: ChangeLog (appversion already bumped) Release/5.3.0-beta11 2022-02-13 15:01:46 +00:00
Athanasius d6c0659e31 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2022-02-13 14:52:15 +00:00
Athanasius cd160682a0 Merge pull request #1460 from EDCD/fix/windows-build_py2exe_semantic-version
windows-build: Try out pre-release py2exe w/ semantic_version==2.9.0
2022-02-13 14:51:39 +00:00
Athanasius 8489ceeffc requirements-dev: Fix setupttools= typos 2022-02-12 22:42:18 +00:00
Athanasius 447908fd0c requirements-dev.txt: Start listing setuptools explicitly
It turned out that the "fixes semantic_version 2.9.0" version of py2exe
then has an issue with infi.systray because I was still using
`setuptools==60.6.0`, as that's what was latest when I last did anything
to cause its installation in my venv.

So, list it explicitly on the latest version, which works with py2exe from
<https://github.com/py2exe/py2exe/actions/runs/1834917831>, and then
dependabot should prod us to keep it up to date.
2022-02-12 22:37:46 +00:00
Athanasius ac7aefbd3e pre-commit: Fix safety invocation
For some reason this was complaining about file names being passed in by
pre-commit when `requirements-dev.txt` and `requirements.txt` were the two
changed files.

Explicitly passing them in `files:` config avoids this.
2022-02-12 18:23:47 +00:00
Athanasius 91276aa99c windows-build: Try out pre-release py2exe w/ semantic_version==2.9.0 2022-02-12 18:12:17 +00:00
Athanasius 3cee7bc1b0 Merge pull request #1458 from EDCD/dependabot/github_actions/develop/actions/github-script-6
build(deps): bump actions/github-script from 5 to 6
2022-02-12 13:01:05 +00:00
Athanasius af514acc11 Merge pull request #1457 from EDCD/enhancement/1451-eddn-schema-fssallbodiesfound
eddn: Implement fssallbodiesfound/1
2022-02-12 13:00:32 +00:00
dependabot[bot] c57bbe878a build(deps): bump actions/github-script from 5 to 6
Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 17:03:46 +00:00
Athanasius a93ee14c05 eddn: Implement schema fssallbodiesfound/1 2022-02-11 16:32:43 +00:00
Athanasius 67c2077962 pre-commit: pre-commit runs mypy *in its own venv*
As such it doesn't have access to any extra modules you installed for your
program, or manually running `mypy <file>`.

So, leverage `additional_dependencies` to list anything that mypy ends
up complaining "that's not installed". Ref:

plugins\eddn.py:40: error: Library stubs not installed for "requests" (or incompatible with Python 3.10)
plugins\eddn.py:40: note: Hint: "python3 -m pip install types-requests"
plugins\eddn.py:40: note: (or run "mypy --install-types" to install all missing stub packages)
plugins\eddn.py:40: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports
Found 1 error in 1 file (checked 1 source file)
2022-02-11 16:32:23 +00:00
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