Athanasius
7bf564d3b3
CAPI: ensure config.capi_debug_access_token is bound/set
2021-11-06 14:56:57 +00:00
Athanasius
6bec46be4e
CAPI: Implement a one-shot override of the Access Token
...
This allows you to force use of an expired token so as to test the code
paths for that without waiting up to 4 hours for the current one to
expire.
NB: The Access Token is *only* stored in the headers of the `requests`
object.
2021-11-06 10:41:33 +00:00
Athanasius
919136874d
CAPI: Re-auth when Access Token expired: Need to .close() first
...
The old code did this, and without it we enter a loop of:
1. CAPI says unauthorized
2. We call login()
3. But companion.session.state == STATE_OK, so do nothing
4. Re-scheduled CAPI request goes back to 1.
2021-11-06 08:41:09 +00:00
Athanasius
7a52ddd278
CAPI: Add retry of request after refreshing Access Token
2021-11-05 17:57:35 +00:00
Athanasius
8e32ecd216
CAPI: Actually try to use Refresh Token if CAPI says unauthorized
...
The refactor for threaded CAPI worker has inadvertently caused us to
always try *full* re-auth when the CAPI signals the Access Token is
expired.
2021-11-05 17:52:50 +00:00
Athanasius
1e00b64bc3
Merge pull request #1329 from EDCD/dependabot/pip/develop/isort-5.10.0
...
build(deps-dev): bump isort from 5.9.3 to 5.10.0
2021-11-03 17:59:34 +00:00
Athanasius
3cda191537
Merge pull request #1328 from EDCD/dependabot/github_actions/develop/actions/checkout-2.4.0
...
build(deps): bump actions/checkout from 2.3.5 to 2.4.0
2021-11-03 17:59:24 +00:00
dependabot[bot]
87cecf4f96
build(deps-dev): bump isort from 5.9.3 to 5.10.0
...
Bumps [isort](https://github.com/pycqa/isort ) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/pycqa/isort/releases )
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md )
- [Commits](https://github.com/pycqa/isort/compare/5.9.3...5.10.0 )
---
updated-dependencies:
- dependency-name: isort
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-03 17:03:50 +00:00
dependabot[bot]
48c10978c6
build(deps): bump actions/checkout from 2.3.5 to 2.4.0
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-03 17:03:39 +00:00
Athanasius
956722dca4
Merge pull request #1326 from EDCD/dependabot/pip/develop/coverage-toml--6.1.1
...
build(deps-dev): bump coverage[toml] from 6.0.2 to 6.1.1
2021-11-01 18:24:05 +00:00
Athanasius
5895cdaf73
Merge pull request #1322 from EDCD/dependabot/pip/develop/autopep8-1.6.0
...
build(deps-dev): bump autopep8 from 1.5.7 to 1.6.0
2021-11-01 18:23:44 +00:00
dependabot[bot]
034a662c48
build(deps-dev): bump coverage[toml] from 6.0.2 to 6.1.1
...
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy ) from 6.0.2 to 6.1.1.
- [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.0.2...6.1.1 )
---
updated-dependencies:
- dependency-name: coverage[toml]
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:04:09 +00:00
dependabot[bot]
927b226f85
build(deps-dev): bump autopep8 from 1.5.7 to 1.6.0
...
Bumps [autopep8](https://github.com/hhatto/autopep8 ) from 1.5.7 to 1.6.0.
- [Release notes](https://github.com/hhatto/autopep8/releases )
- [Commits](https://github.com/hhatto/autopep8/compare/v1.5.7...v1.6.0 )
---
updated-dependencies:
- dependency-name: autopep8
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-25 17:03:41 +00:00
Athanasius
945baf7f53
Merge branch 'stable'
2021-10-25 11:12:39 +01:00
Athanasius
6f31e18947
Release 5.2.0: appversion & changelog
2021-10-25 11:02:54 +01:00
Athanasius
571579c197
Merge branch 'develop' into beta
2021-10-25 10:56:01 +01:00
Athanasius
13d0f94a46
L10n: Translations updated
2021-10-25 10:54:57 +01:00
Athanasius
6a88273723
Merge pull request #1320 from EDCD/dependabot/pip/develop/flake8-use-fstring-1.3
...
build(deps-dev): bump flake8-use-fstring from 1.2.1 to 1.3
2021-10-22 19:30:39 +01:00
dependabot[bot]
a622d1673a
build(deps-dev): bump flake8-use-fstring from 1.2.1 to 1.3
...
Bumps [flake8-use-fstring](https://github.com/MichaelKim0407/flake8-use-fstring ) from 1.2.1 to 1.3.
- [Release notes](https://github.com/MichaelKim0407/flake8-use-fstring/releases )
- [Commits](https://github.com/MichaelKim0407/flake8-use-fstring/compare/v1.2.1...v1.3 )
---
updated-dependencies:
- dependency-name: flake8-use-fstring
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-22 17:02:29 +00:00
Athanasius
73a8ddfd98
Merge pull request #1319 from EDCD/dependabot/pip/develop/flake8-use-fstring-1.2.1
...
build(deps-dev): bump flake8-use-fstring from 1.2 to 1.2.1
2021-10-21 18:12:10 +01:00
dependabot[bot]
7e1c1be08b
build(deps-dev): bump flake8-use-fstring from 1.2 to 1.2.1
...
Bumps [flake8-use-fstring](https://github.com/MichaelKim0407/flake8-use-fstring ) from 1.2 to 1.2.1.
- [Release notes](https://github.com/MichaelKim0407/flake8-use-fstring/releases )
- [Commits](https://github.com/MichaelKim0407/flake8-use-fstring/compare/v1.2...v1.2.1 )
---
updated-dependencies:
- dependency-name: flake8-use-fstring
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-10-21 17:03:58 +00:00
Athanasius
00e46679d0
Pre-Release 5.2.0-beta3: appversion & changelog
2021-10-20 15:11:59 +01:00
Athanasius
8d55e9f02c
Merge pull request #1316 from EDCD/fix/1018/update-and-docked-status
...
CAPI: Avoid '... EDO Settlement?' for 'Update' in space
2021-10-20 15:05:28 +01:00
Athanasius
338713d6af
Merge pull request #1315 from EDCD/enhancement/1269-status-no-capi-data
...
Notify user when 'File' > 'Status' fails
2021-10-20 15:02:42 +01:00
Athanasius
3f0f1fe39f
CAPI: Avoid '... EDO Settlement?' for 'Update' in space
...
1. Logged out in space
2. Logged back in
3. Run EDMC
4. Hit Update button, get "Docked but unknown station: EDO Settlement?"
In investigating this I realised that the entire else needed to be "if
docked according to CAPI".
Then it became clear that there was a redundant conditional, as the
enclosing one is already testing:
`capi_response.capi_data['lastStarport']['name'] != monitor.station:`
Making the:
`if last_station != monitor.station`
conditional un-necessary.
2021-10-20 14:50:03 +01:00
Athanasius
531302b7da
Notify user when 'File' > 'Status' fails
...
Rather than a silent failure, set a status line message and also play
the 'bad' sound to draw their attention to it.
2021-10-20 14:32:04 +01:00
Athanasius
3e046c1f65
Pre-Release 5.2.0-beta1: appversion and changelog
2021-10-20 13:14:16 +01:00
Athanasius
832316517e
requirements-dev: Bump flake8-use-fstring and flake8 itself
2021-10-20 09:14:43 +01:00
Athanasius
6a0325bb76
Merge pull request #1313 from EDCD/enhancement/eddn-do-not-replaylog-unknown-schema
...
EDDN: Drop any 'unknown schema' messages so they're not retried
2021-10-20 09:10:00 +01:00
Athanasius
3ec9c81e19
EDDN: Drop any 'unknown schema' messages so they're not retried
2021-10-19 16:01:54 +01:00
Athanasius
9a58da57cd
Pre-Release 5.2.0-beta1: appversion & changelog
2021-10-18 15:39:18 +01:00
Athanasius
1e65b60836
Merge pull request #1308 from EDCD/enhancement/eddn-CAPIdata-always-use-journal-horizons
...
EDDN: Ensure we always send `horizons` flag where schema allows
2021-10-18 14:33:16 +01:00
Athanasius
7dcb275e9b
EDDN: Document HORIZONS_SKU, and to NOT use the others
2021-10-18 14:18:11 +01:00
Athanasius
cf5806021e
PLUGINS.md: capi_is_horizons() now
2021-10-18 12:33:11 +01:00
Athanasius
c97b539ac3
EDDN: Revert to using capi_is_horizons() in export_commodities()
2021-10-18 12:25:35 +01:00
Athanasius
694321064d
EDDN: Rename is_horizons() and document that it's for CAPI data only
...
OK, it has `data` passed in, so this should be obvious, but let's make
it explicit both by name and in the docstring.
The docstring now also emphasies that *this* check **MUST** be used for
CAPI data, as it's dependent only on the availability of Horizons on the
account, and not on the `LoadGame` flags.
2021-10-18 12:20:06 +01:00
Athanasius
d8689e5b9b
Revert "EDDN: If this.horizons is true, use that in is_horizons() check"
...
This reverts commit ca80edd34d88298a2c9d933f79f0da8e68d870eb.
2021-10-18 12:10:09 +01:00
Athanasius
90aa2698cd
Revert "EDDN: Just use this.horizons for CAPI data sending"
...
This reverts commit bd183efbd4dfa8365246952f04352403195102aa.
2021-10-18 12:09:55 +01:00
Athanasius
e148197971
Revert "EDDN: use this.odyssey for Journal outfitting and shipyard"
...
This reverts commit 4fef4257bd00376f45e94a35db925c0fbb58b267.
2021-10-18 12:08:32 +01:00
Athanasius
98f215e6ad
EDDN: Remove horizons flag from navroute messages
...
As with `odyssey` this isn't currently in the not-yet-live schema.
2021-10-17 16:46:11 +01:00
Athanasius
29b69745f3
EDDN: document that some EDDN messages aren't retried
2021-10-17 16:32:38 +01:00
Athanasius
4fef4257bd
EDDN: use this.odyssey for Journal outfitting and shipyard
...
For consistency with the horizons flag. They *are* placed *from* the
`this` versions into `entry`, but we might as well go the direct route.
They have to be set explicitly here as we process the `entry` to make a
wholly new `message` rather than the `message` just being `entry` with
some changes.
2021-10-17 16:20:46 +01:00
Athanasius
b3419ec548
EDDN: Also set commodity/3->horizons for journal-sourced data
2021-10-17 16:17:58 +01:00
Athanasius
a32546b001
EDDN: Set horizons on commodity/3 messages as per schema
2021-10-17 16:14:35 +01:00
Athanasius
556ace5306
EDDN: Use this.odyssey rather than passing to functions
2021-10-17 15:47:12 +01:00
Athanasius
bd183efbd4
EDDN: Just use this.horizons for CAPI data sending
2021-10-17 15:41:15 +01:00
Athanasius
488fdf4976
Merge pull request #1306 from EDCD/fix/eddn-quieten-unknown-schema-errors
...
EDDN: Quieten "unknown schema" errors
2021-10-17 15:35:25 +01:00
Athanasius
ee272fdeba
Merge pull request #1307 from EDCD/fix/1259/eddn-horizons-flag
...
EDDN: Fix `horizons` flag for CAPI-sourced data
2021-10-17 15:35:12 +01:00
Athanasius
ca80edd34d
EDDN: If this.horizons is true, use that in is_horizons() check
2021-10-17 15:01:51 +01:00
Athanasius
aecf375138
EDDN: Record horizons flag in journal_entry()
...
So that we can then first check *this* in `is_horizons()`.
2021-10-17 14:55:43 +01:00
