1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 11:50:28 +03:00

4454 Commits

Author SHA1 Message Date
Athanasius
d5d2577019
Merge pull request #1484 from EDCD/fix/1482/approachsettlement-before-login-location
EDDN: approachsettlement/1: Bail if no System (name) yet
2022-02-21 11:41:55 +00:00
Athanasius
562a224857
EDDN: approachsettlement/1: Bail if no System (name) yet
* A login-time `ApproachSettlement` happens before `Location`, if
  appropriate.
* Also add a future comment about FSSSignalDiscovered, for if EDDN ever adds
  the schema.
2022-02-20 19:44:53 +00:00
Athanasius
6f8847e3e1
EDDN: approachsettlement/1: Don't claim entry_augment_system_data() as only for us 2022-02-20 19:30:45 +00:00
Athanasius
e998d05d51
Merge pull request #1480 from EDCD/fix/1479/theme-catch-widget-issues
Attempt to prevent plugin widget issues from bringing down whole UI
2022-02-20 19:10:21 +00:00
Athanasius
520ff5868f
theme.py: Apply .configure() paranoia on button enter/leave 2022-02-20 19:05:41 +00:00
Athanasius
17530c2d2b
theme.py: Log widget if exception is thrown 2022-02-19 11:48:27 +00:00
Athanasius
10977ccb07
Prevent plugin widget code issues from breaking theme changes
This adds a try/except around a bunch of .configure() calls on widgets.
Yes, sure, this could then leave the widget in question in a broken state,
but at least our entire UI won't fall flat on its face.
2022-02-19 11:15:06 +00:00
Athanasius
6a9645d43a
Merge pull request #1477 from EDCD/fix/1476/approachsettlement-check-for-latlng
EDDN: Handle ApproachSettlement missing planetary coords
2022-02-19 10:44:48 +00:00
Athanasius
dbe30264ec
Merge pull request #1478 from EDCD/dependabot/pip/develop/setuptools-60.9.3
build(deps-dev): bump setuptools from 60.9.2 to 60.9.3
2022-02-18 17:45:16 +00:00
dependabot[bot]
0844b3f8e6
build(deps-dev): bump setuptools from 60.9.2 to 60.9.3
Bumps [setuptools](https://github.com/pypa/setuptools) from 60.9.2 to 60.9.3.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v60.9.2...v60.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-18 17:04:14 +00:00
Athanasius
e51aba1cc3
EDDN: Handle ApproachSettlement missing planetary coords 2022-02-18 15:23:27 +00:00
Athanasius
4f1fa86708
Merge pull request #1475 from EDCD/dependabot/pip/develop/lxml-4.8.0
build(deps-dev): bump lxml from 4.7.1 to 4.8.0
2022-02-17 17:17:37 +00:00
dependabot[bot]
7e4ffcf1ef
build(deps-dev): bump lxml from 4.7.1 to 4.8.0
Bumps [lxml](https://github.com/lxml/lxml) from 4.7.1 to 4.8.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.7.1...lxml-4.8.0)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-17 17:05:42 +00:00
Athanasius
46a807deb1
PLUGINS: Call out keeping an eye on Discussions 2022-02-17 12:17:20 +00:00
Athanasius
aa61aaf830
Merge pull request #1472 from EDCD/dependabot/pip/develop/types-requests-2.27.10
build(deps-dev): bump types-requests from 2.27.9 to 2.27.10
2022-02-16 17:50:34 +00:00
Athanasius
cc8a9aec36
Merge pull request #1473 from EDCD/dependabot/pip/develop/setuptools-60.9.2
build(deps-dev): bump setuptools from 60.9.1 to 60.9.2
2022-02-16 17:50:27 +00:00
dependabot[bot]
e95c96bac2
build(deps-dev): bump setuptools from 60.9.1 to 60.9.2
Bumps [setuptools](https://github.com/pypa/setuptools) from 60.9.1 to 60.9.2.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v60.9.1...v60.9.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 17:03:23 +00:00
dependabot[bot]
485ad394e6
build(deps-dev): bump types-requests from 2.27.9 to 2.27.10
Bumps [types-requests](https://github.com/python/typeshed) from 2.27.9 to 2.27.10.
- [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-16 17:03:17 +00:00
Athanasius
27e52f1294
Merge branch 'main' into develop 2022-02-15 22:21:34 +00:00
Athanasius
dc413cdf1a
develop: Bump appversion to 5.3.1-beta1 2022-02-15 17:47:54 +00:00
Athanasius
05b5013d4f
Merge pull request #1468 from EDCD/dependabot/pip/develop/setuptools-60.9.1
build(deps-dev): bump setuptools from 60.8.2 to 60.9.1
2022-02-15 17:09:05 +00:00
Athanasius
aad658318b
Merge pull request #1464 from EDCD/dependabot/pip/develop/pytest-7.0.1
build(deps-dev): bump pytest from 7.0.0 to 7.0.1
2022-02-15 17:08:56 +00:00
dependabot[bot]
53835dd368
build(deps-dev): bump setuptools from 60.8.2 to 60.9.1
Bumps [setuptools](https://github.com/pypa/setuptools) from 60.8.2 to 60.9.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v60.8.2...v60.9.1)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-15 17:03:58 +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
dependabot[bot]
e6c940e0ca
build(deps-dev): bump pytest from 7.0.0 to 7.0.1
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.0 to 7.0.1.
- [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/7.0.0...7.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 17:05:21 +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