ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-11-08 02:02:33 +03:00
Code Issues Projects Releases Wiki Activity
5,064 Commits 17 Branches 299 Tags
c3100b1fd5efaa27cb5d225e43d8a0f4986491c0
Commit Graph
5064 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius c3100b1fd5 github/submodule-update: Also run on develop pushes 2022-12-17 12:50:48 +00:00
Athanasius 273962e679 github/submodule-update: Move back to using our defined env 
We need to run against `develop`, even when on `main` using a cron, so
actually use the environment vars we define.
 2022-12-17 12:50:13 +00:00
Athanasius 414f9d8dae github/submodule-update: Use single 0 in cron spec 
Just in case that `00` was the issue.  It ran fine with `10 * * * *`.
 2022-12-17 12:50:12 +00:00
Athanasius 06d83399c0 Revert "github/submodule-update: Run *every* hour for test purposes" 
This reverts commit ee1c739ee1.
 2022-12-17 12:50:11 +00:00
Athanasius de16284b25 github/submodule-update: Run *every* hour for test purposes 2022-12-17 12:50:11 +00:00
Athanasius 70a9c7d8ab github/submodule-update: Run every day at mid-day. 2022-12-17 11:30:56 +00:00
Athanasius 640223472b github/submodule-update: Remove unused 'Add labels' step 
1. This was commented out.
2. It's not necessarily up to date with what *works*, so just delete it.
 2022-12-17 11:26:51 +00:00
Athanasius 8fab1fa811 github/submodule-update: Make better branch names 2022-12-17 11:25:16 +00:00
Athanasius 130bda0cc9 github/submodule-update: Try to use git status output in PR body 2022-12-17 11:21:03 +00:00
Athanasius 424e9754b1 github/submodule-update: Let's try github contexts 2022-12-17 11:14:18 +00:00
Athanasius a68c23e525 github/submodule-update: Fix process.env syntax ? 2022-12-17 09:59:17 +00:00
Athanasius 8831d15220 github/submodule-update: Switch to process.env for owner, repo, base 2022-12-17 09:56:40 +00:00
Athanasius e0f6f35311 github/submodule-update: Change to secrets.GITHUB_TOKEN 
That works in the windows-build.yml workflow.
 2022-12-17 09:48:21 +00:00
Athanasius acbb8b2294 github/submodule-update: Switch to 'environment' style 
As per <https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-output-parameter>
 2022-12-17 09:42:22 +00:00
Athanasius ede69a9012 github/submodule-update: steps.check_for_changes condition not working 
* Now I'm guessing at what the syntax needs to be, but the bare
  `steps.check_for_changes.outputs.changes` results in it being considerd
  `null` for the check.
 2022-12-17 09:34:33 +00:00
Athanasius 859fe81d71 github/submodule-update: Ensure exit 0 on the update check 
I *think* the `exit 0` is to ensure the 'Check for changes' isn't considered
failed due to `git` exit code.
 2022-12-16 17:27:13 +00:00
Athanasius 3e0da4b537 github/submodule-update: Needs an 'else' to actually work 
* Somehow this had been left in a state where it would always signal
  "no changes".
 2022-12-16 17:24:11 +00:00
Athanasius cfbce496c5 Merge pull request #1759 from EDCD/enhancement/1714/capi-killswitches 
companion: A start on adding CAPI killswitches
 2022-12-16 16:01:10 +00:00
Athanasius 5070c3686f companion.Session: Don't double-initaliase requests_session 
I forgot to remove the `requests.Session()` call in `start_frontier_auth()`.
And upon removing that we need a `None` trap to make mypy happy.
 2022-12-16 15:40:48 +00:00
Athanasius 729016cf38 companion.py: Fix exception type & initialise a requests_session 
* Use `Exception` not `BaseException` for `EDMCCAPIFailedRequest.exception`.
* Initialise Auth.request_session in its `__init__()`.  This *should* fix
  #1727 - as there'll then be no way for a `Session` to have methods invoked
  without this set up.
 2022-12-16 15:35:59 +00:00
Athanasius ba68397b3f CAPI killswitches: endpoint killswitches & eddn export ones too 
* Added `capi.request.<endpoint>` killswitches at appropriate call points.
* Added `eddn.capi_export.<type>` killswitches.  This allows for killing
  just the EDDN export of such CAPI-derived data, without stopping the actual
  queries, as other plugins/functionality might still have harmless use of
  the data.
* PLUGINS.md: Actually describe the contents of `data` passed to plugins, and
  point out it might not always contain market or shipyard data.  This is
  not only because of the new killswitches, but could already have happened
  if the station/port docked at didn't have the services.
* Some misc typing cleanups.
 2022-12-16 15:06:01 +00:00
Athanasius 1cc4a9d0af CAPI killswitches: 'capi.auth' now preventing all CAPI actions. 2022-12-16 14:17:00 +00:00
Athanasius 12ee3deb59 killswitches: Implement --killswitches-file CL arg 
* New CL arge `--killswitches-file`.  This needs to reference a file either
  with an absolute path, or relative to the CWD of the process.
* Internally if the argument is provided it is prefixed with `"file:"` in
  order to actually be loaded.  This is because `requests` doesn't have an
  adapter for `file:` URLs.
* Also fixes a visual bug with reporting of active killswitches.  The entire
  SingleKill object was used instead of just its `reason` property.  mypy
  type checks caught this.
 2022-12-16 14:02:59 +00:00
Athanasius f1b2022aa2 .mypy.ini: s/-/_/g on check-untyped-defs 2022-12-16 13:27:21 +00:00
Athanasius 98527e7aa0 pre-commit: Bump mypy to current latest version 
* The older version didn't like `check_untyped_defs = True` in .mypy.ini.
* Trying `-repo: local` lead to an error about config options.
* We really need a way to have this track the non-pre-commit version of mypy.
 2022-12-16 13:24:50 +00:00
Athanasius f789ad6e24 companion: A start on adding CAPI killswitches 2022-12-16 13:22:30 +00:00
Athanasius a9ff256afd Merge branch 'release-5.7.0' into develop 2022-12-16 11:18:47 +00:00
Athanasius defdc2b325 Release 5.7.0: appversion & changelog 
No functional changes from 5.7.0-rc1, just a few ChangeLog tweaks.
Release/5.7.0 		2022-12-16 10:51:43 +00:00
Athanasius 3c99435865 Merge pull request #1757 from EDCD/dependabot/pip/develop/autopep8-2.0.1 
build(deps-dev): bump autopep8 from 2.0.0 to 2.0.1
 2022-12-15 18:36:08 +00:00
dependabot[bot] 395dde1c09 build(deps-dev): bump autopep8 from 2.0.0 to 2.0.1 
Bumps [autopep8](https://github.com/hhatto/autopep8) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/hhatto/autopep8/releases)
- [Commits](https://github.com/hhatto/autopep8/compare/v2.0.0...v2.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-15 17:00:54 +00:00
Athanasius bd6243c845 Merge pull request #1756 from EDCD/dependabot/pip/develop/isort-5.11.2 
build(deps-dev): bump isort from 5.11.1 to 5.11.2
 2022-12-14 17:02:31 +00:00
dependabot[bot] 28071181a1 build(deps-dev): bump isort from 5.11.1 to 5.11.2 
Bumps [isort](https://github.com/pycqa/isort) from 5.11.1 to 5.11.2.
- [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.11.1...5.11.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-14 17:01:07 +00:00
Athanasius 34fe5917ae develop: Bump appversion to 5.7.1-alpha0 2022-12-14 15:32:10 +00:00
Athanasius 39867acdd5 5.7.0-rc1/ChangeLog: Fix minor typo 2022-12-14 14:21:43 +00:00
Athanasius 858efbdd54 Pre-Release 5.7.0-rc1: appversion and changelog Release/5.7.0-rc1 2022-12-14 14:02:34 +00:00
Athanasius e2f4f8f665 PLUGINS.md: Slightly improve CAPI Legacy/Live doc 2022-12-14 13:51:29 +00:00
Athanasius 281703aa99 FDevIDs: Updated to latest master 2022-12-14 12:26:56 +00:00
Athanasius d6103aee9e corilios-data: Updated, and new modules.p content. 2022-12-14 12:26:05 +00:00
Athanasius 0a01a8c24c edmc_data: Small tweaks to try and make outfitting.py happier 
But, as it turns out, the uses of this code and data are very minimal.
No-one's been complaining about things being out of date or not working.

All of these *_map dictionaries are just for mapping parts of module
identifiers to English Text.  In the end they only end up in the output of
`EDMC.py -e <file>`, which despite being called "E:D Shipyard plain text
format" isn't actually supported by edsy.org.
 2022-12-14 12:24:07 +00:00
Athanasius 97d0ecec7b coriolis.py: Don't bother with the 'Check data is present' thing 
* Also two missileracks are *not* now 'missing' in coriolis-data, so no need
  to manually add them.
 2022-12-14 12:23:14 +00:00
Athanasius fa8bbe8fa4 Python: Bump to version 3.11.1, still 32-bit 
Build tested, both .exe files work from `dist.win32` directory.
 2022-12-14 11:47:07 +00:00
Athanasius 57cdda6218 docs/Releasing: no .wxs file updated needed for python version bump 
The file is auto-generated, so the "different filename of python DLLs" is
taken care of by the build process.
 2022-12-14 11:45:59 +00:00
Athanasius 2fdc14c371 requirements-dev: Bump lxml to 4.9.2 
This version has Python 3.11 wheels.
 2022-12-14 11:39:05 +00:00
Athanasius d48501c37b Merge pull request #1754 from EDCD/fix/1720/EDMC_-n 
EDMC.py quietening and fixes
 2022-12-14 11:32:13 +00:00
Athanasius e245a75e61 EDMC: Get -n working again 
* eddn: Don't schedule `queue_check_and_send()` if EDMC_NO_UI.
* `export_(commodites|outfitting|shipyard)` lost the `is_odyssey` argument
 in 556ace5306 .
* EDDNSender: Helper `set_ui_status()` in which the check for EDMC_NO_UI
  is performed.  Used in `send_message()`.  In the EDMC_NO_UI case it will
  INFO log the text instead.
 2022-12-14 11:15:20 +00:00
Athanasius 79bbc8917f Move 'this is the GameVersion we found' logging to DEBUG 
This quietens it for normal EDMC.py usage.
 2022-12-14 10:51:37 +00:00
Athanasius 2ff04dd659 Merge pull request #1753 from EDCD/dependabot/pip/develop/isort-5.11.1 
build(deps-dev): bump isort from 5.10.1 to 5.11.1
 2022-12-14 10:42:28 +00:00
Athanasius 320236f7a7 Merge pull request #1752 from EDCD/dependabot/pip/develop/safety-2.3.5 
build(deps-dev): bump safety from 2.3.4 to 2.3.5
 2022-12-14 10:42:21 +00:00
Athanasius 605ad07aac Merge pull request #1747 from EDCD/enhancement/1728/capi-for-legacy 
CAPI: Enable use of Legacy host when applicable.
 2022-12-14 10:42:05 +00:00
dependabot[bot] d49e865260 build(deps-dev): bump isort from 5.10.1 to 5.11.1 
Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.11.1.
- [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.10.1...5.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-13 17:01:07 +00:00