1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-15 16:50:34 +03:00

4895 Commits

Author SHA1 Message Date
Athanasius
86810a97e5
github pr-checks: Rename the overall job to code-checks
It includes all of the setup, the actual flake8 run, and now a pytest run.
2022-09-05 13:12:21 +01:00
Athanasius
e2813c0ff9
.github/workflows: Bump us up to Ubuntu 22.04, as 18.04 is deprecated 2022-09-05 13:10:03 +01:00
Athanasius
ca6a0355d2
tests: Run pytest as part of GitHub PR checks 2022-09-05 13:07:28 +01:00
Athanasius
130bd619cf
tests: journal_lock: Cleanup properly in test_update_lock()
* As this involved two directories we also need to clean up the 'old' one.
2022-09-05 12:55:39 +01:00
Athanasius
725473e2db
tests: journal_lock: Finale factory change fixups & cleanup
* `test_release_lock()` needed `.getbasetemp()` on `mock_journaldir` usage.
* Add removal of lock file to `other_process_lock()`
2022-09-05 12:51:52 +01:00
Athanasius
34f1989b0b
tests: journal_lock: Use .getbasetemp() in test_obtain_lock_already_locked 2022-09-05 12:49:11 +01:00
Athanasius
fb0c139865
tests: journal_lock: Ensure all tests, that should, clean up 2022-09-05 12:44:13 +01:00
Athanasius
ddf6669f35
tests: journal_lock: fix test_obtain_lock_with_tmpdir_ro()
* Set `tmpdir` properly for this test.
* Do **NOT** unset `JournalLock.journal_dir_lockfile_name` on release, as
  this is needed to remove the file
* Ensure prior test(s) release their locks, *and* remove the file.
2022-09-05 12:39:03 +01:00
Athanasius
27d93b5f31
tests: journal_lock: Need <factory>.getbasetemp() and str() as necessary 2022-09-05 12:17:54 +01:00
Athanasius
9915c5435d
tests: journal_lock: test_update_lock_same: Make .obtain.lock() an assert 2022-09-05 11:51:12 +01:00
Athanasius
b47f278655
tests: journal_lock: Fix test_journal_lock_init test
* It's `tmp_path_factory` now, not `tmpdir_factory`.
* Need to `str(...)` if a string is what we want.
2022-09-05 11:49:05 +01:00
Athanasius
cc37b23db4
tests: journal_lock: Fix up pytest tmpdir types 2022-09-05 09:22:55 +01:00
Athanasius
b1312df31b
Merge pull request #1655 from EDCD/dependabot/pip/develop/pytest-7.1.3
build(deps-dev): bump pytest from 7.1.2 to 7.1.3
2022-09-02 18:05:15 +01:00
dependabot[bot]
7608167916
build(deps-dev): bump pytest from 7.1.2 to 7.1.3
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.2 to 7.1.3.
- [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.1.2...7.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-02 17:03:45 +00:00
Athanasius
e530544ac5
eddn: fcmaterials: Now working for the two separate schemas 2022-09-02 17:27:16 +01:00
Athanasius
69ef3b7d39
eddn: fcmaterials: Actually send horizons and odyssey flags for CAPI data 2022-08-31 16:34:21 +01:00
Athanasius
c77576f3d4
EDDN: fcmaterials/1 from CAPI /market data 2022-08-31 15:59:34 +01:00
Athanasius
37553d6bc7
EDDN: Add 'data-source' to Journal FCMaterials export 2022-08-31 15:19:54 +01:00
Athanasius
a61829eaf7
EDDN: Implement Journal-based fcmaterials/1 schema
The EDDN schema is still a work in progress, unsure if we'll use the same
one for both Journal and CAPI sourced data, or separate schemas.

But, so far, this works.
2022-08-30 17:17:00 +01:00
Athanasius
b6bca0c02a
Merge pull request #1652 from EDCD/dependabot/pip/develop/setuptools-65.3.0
build(deps-dev): bump setuptools from 65.2.0 to 65.3.0
2022-08-30 15:45:31 +01:00
dependabot[bot]
db3e18e3c9
build(deps-dev): bump setuptools from 65.2.0 to 65.3.0
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.2.0 to 65.3.0.
- [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/v65.2.0...v65.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 17:03:37 +00:00
Athanasius
b78a274218
Merge pull request #1651 from EDCD/dependabot/pip/develop/flake8-noqa-1.2.9
build(deps-dev): bump flake8-noqa from 1.2.8 to 1.2.9
2022-08-23 18:13:29 +01:00
Athanasius
77f1e493e9
Merge pull request #1650 from EDCD/dependabot/pip/develop/pep8-naming-0.13.2
build(deps-dev): bump pep8-naming from 0.13.1 to 0.13.2
2022-08-23 18:13:25 +01:00
Athanasius
4b321a8e02
Merge pull request #1649 from EDCD/dependabot/pip/develop/setuptools-65.2.0
build(deps-dev): bump setuptools from 65.1.0 to 65.2.0
2022-08-23 18:13:17 +01:00
dependabot[bot]
f1a470c254
build(deps-dev): bump flake8-noqa from 1.2.8 to 1.2.9
Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.2.8 to 1.2.9.
- [Release notes](https://github.com/plinss/flake8-noqa/releases)
- [Commits](https://github.com/plinss/flake8-noqa/compare/v1.2.8...v1.2.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 17:04:04 +00:00
dependabot[bot]
3d5b162763
build(deps-dev): bump pep8-naming from 0.13.1 to 0.13.2
Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.13.1 to 0.13.2.
- [Release notes](https://github.com/PyCQA/pep8-naming/releases)
- [Changelog](https://github.com/PyCQA/pep8-naming/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/PyCQA/pep8-naming/compare/0.13.1...0.13.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 17:04:00 +00:00
dependabot[bot]
ba21716aa8
build(deps-dev): bump setuptools from 65.1.0 to 65.2.0
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.1.0 to 65.2.0.
- [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/v65.1.0...v65.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 17:03:53 +00:00
Athanasius
0722a35d60
Merge pull request #1647 from EDCD/dependabot/pip/develop/types-requests-2.28.9
build(deps-dev): bump types-requests from 2.28.8 to 2.28.9
2022-08-21 21:18:34 +01:00
Athanasius
2480c4c4d4
Merge pull request #1646 from EDCD/dependabot/pip/develop/setuptools-65.1.0
build(deps-dev): bump setuptools from 64.0.2 to 65.1.0
2022-08-21 21:18:29 +01:00
Athanasius
fe462611b3
Merge pull request #1645 from EDCD/dependabot/pip/develop/coverage-toml--6.4.4
build(deps-dev): bump coverage[toml] from 6.4.3 to 6.4.4
2022-08-21 21:18:23 +01:00
dependabot[bot]
c777a409fb
build(deps-dev): bump types-requests from 2.28.8 to 2.28.9
Bumps [types-requests](https://github.com/python/typeshed) from 2.28.8 to 2.28.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-08-19 17:04:44 +00:00
dependabot[bot]
b5f0ae7c62
build(deps-dev): bump setuptools from 64.0.2 to 65.1.0
Bumps [setuptools](https://github.com/pypa/setuptools) from 64.0.2 to 65.1.0.
- [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/v64.0.2...v65.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-19 17:04:41 +00:00
dependabot[bot]
e2d70a13a9
build(deps-dev): bump coverage[toml] from 6.4.3 to 6.4.4
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.4.3 to 6.4.4.
- [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.4.3...6.4.4)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-16 17:03:05 +00:00
Athanasius
23abab936b
FDevIDs: Update to latest origin/master HEAD 2022-08-16 11:55:15 +01:00
Athanasius
2df1858fce
Merge pull request #1641 from EDCD/fix/1061/python-deprecation-local.format
l10n: Use locale.format_string() instead of deprecated locale.format()
2022-08-15 12:00:21 +01:00
Athanasius
fa834daaca
PLUGINS.md: Fix example return type hint for journal_entry()
It's `Optional[str]` for possible error string being returned.
2022-08-15 08:39:34 +01:00
Athanasius
86e148ddb0
Merge pull request #1639 from EDCD/fix/1638/inara-approachsettlement-no-marketid
inara: ApproachSettlement: Only set marketID if present in event
2022-08-13 18:43:19 +01:00
Athanasius
5fa9bcd48e
inara: Wrap the <var> := <dict get> in () so <var> isn't a bool
Because, yes, 'is not' binds more tightly than ':='.
2022-08-13 18:34:28 +01:00
Athanasius
99897ee39d
Merge pull request #1640 from EDCD/dependabot/pip/develop/setuptools-64.0.2
build(deps-dev): bump setuptools from 63.4.2 to 64.0.2
2022-08-13 15:40:22 +01:00
Athanasius
abebcf77d3
l10n: Use locale.format_string() instead of deprecated locale.format() 2022-08-13 15:34:33 +01:00
dependabot[bot]
dadea8c410
build(deps-dev): bump setuptools from 63.4.2 to 64.0.2
Bumps [setuptools](https://github.com/pypa/setuptools) from 63.4.2 to 64.0.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/v63.4.2...v64.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-12 17:03:19 +00:00
Athanasius
7b47dab543
inara: ApproachSettlement: Only set marketID if present in event
At least 'Ancient Ruins' generate an `ApproachSettlement` event without a
`MarketID` in the event.  Not even a key with `null` value.
2022-08-12 13:57:31 +01:00
Athanasius
1296159532
Merge pull request #1636 from EDCD/fix/1634/naverouteclear
Handle NavRouteClear
2022-08-10 12:09:06 +01:00
Athanasius
f28228285a
plugins/eddn: Do *NOT* alert user on 'no Route in NavRoute'
This can simply occur if the *first* load of `NavRoute.json` soft-fails,
meaning the plugin is receiving the bare Journal-file event, which has no
`Route` array.
2022-08-10 11:51:23 +01:00
Athanasius
1bb0bf9f74
PLUGINS.md: Document NavRouteClear behaviour 2022-08-10 11:47:51 +01:00
Athanasius
ddba99bfd8
monitor: Handle NavRouteClear & un-() an assert
* Stop trying to load `NavRoute.json` if it contained a `NavRouteClear`.
* `assert` is a *keyword*, not a function.
2022-08-10 11:28:10 +01:00
Athanasius
337e7d9272
Merge pull request #1635 from EDCD/dependabot/pip/develop/autopep8-1.7.0
build(deps-dev): bump autopep8 from 1.6.0 to 1.7.0
2022-08-09 18:24:37 +01:00
dependabot[bot]
653afc0d15
build(deps-dev): bump autopep8 from 1.6.0 to 1.7.0
Bumps [autopep8](https://github.com/hhatto/autopep8) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/hhatto/autopep8/releases)
- [Commits](https://github.com/hhatto/autopep8/compare/v1.6.0...v1.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-09 17:16:33 +00:00
Athanasius
0aac6cc8a8
Merge pull request #1631 from EDCD/dependabot/pip/develop/coverage-toml--6.4.3
build(deps-dev): bump coverage[toml] from 6.4.2 to 6.4.3
2022-08-08 18:13:22 +01:00
Athanasius
51ac53094e
Merge pull request #1630 from EDCD/dependabot/pip/develop/setuptools-63.4.2
build(deps-dev): bump setuptools from 63.4.1 to 63.4.2
2022-08-08 18:13:14 +01:00