Athanasius
bcabd97f4c
FDevIDs: Switch code to using FDevIDs/ files
2021-12-17 11:08:14 +00:00
Athanasius
096b41fa84
fdevids: Add FDevIDs repo as a submodule
2021-12-16 17:34:46 +00:00
Athanasius
48fcf58041
Merge pull request #1375 from EDCD/dependabot/pip/develop/mypy-0.920
...
build(deps-dev): bump mypy from 0.910 to 0.920
2021-12-16 17:05:12 +00:00
Athanasius
c977355c1a
Merge pull request #1374 from EDCD/dependabot/pip/develop/lxml-4.7.1
...
build(deps-dev): bump lxml from 4.6.4 to 4.7.1
2021-12-16 17:04:54 +00:00
dependabot[bot]
becdd8ce83
build(deps-dev): bump mypy from 0.910 to 0.920
...
Bumps [mypy](https://github.com/python/mypy ) from 0.910 to 0.920.
- [Release notes](https://github.com/python/mypy/releases )
- [Commits](https://github.com/python/mypy/compare/v0.910...v0.920 )
---
updated-dependencies:
- dependency-name: mypy
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-16 17:04:07 +00:00
dependabot[bot]
8bae11c84b
build(deps-dev): bump lxml from 4.6.4 to 4.7.1
...
Bumps [lxml](https://github.com/lxml/lxml ) from 4.6.4 to 4.7.1.
- [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.6.4...lxml-4.7.1 )
---
updated-dependencies:
- dependency-name: lxml
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-16 17:03:58 +00:00
Athanasius
ea0fa7c77d
develop: Bump appversion to 5.3.0-beta3
2021-12-16 13:06:09 +00:00
Athanasius
aedf0bf800
Merge pull request #1368 from EDCD/enhancement/1367/installer-all-files
...
Automate always including **all** files that py2exe places in `dist.win32`
2021-12-16 13:05:40 +00:00
Athanasius
d0479d145b
Merge pull request #1366 from EDCD/enhancement/1349/python-3.10
...
Upgrade to using Python 3.10
2021-12-16 13:05:11 +00:00
Athanasius
fc3a7b32a3
l10n: Make the zh-CN -> zh-Hans comment a HACK
2021-12-11 14:15:30 +00:00
Athanasius
72fc78048f
l10n: Change zh-CN to zh-Hans in preferred_languages().
2021-12-11 10:59:43 +00:00
Athanasius
381c156fb9
l10n: Change _Locale.preferred_languages() to use a common return var
...
This is the first step before putting any necessary "difference between
OneSky and system names for languages" translations in.
2021-12-11 10:53:31 +00:00
Athanasius
43d98bff1c
WiX: Add/update comments in template.wxs about auto-generation
...
We *are* now using auto GUIDs. It worked for a 5.2.3 -> 5.3.0-beta2
upgrade install. I suspect that specifying 'MajorUpgrade' means the
GUIDs mostly don't even matter. They're there for if you try to patch
so as to patch the correct files?
2021-12-07 17:36:51 +00:00
Athanasius
6737ab9322
WiX: Rename to wix/static-EDMarketConnector.wxs and .gitignore generated
2021-12-07 17:20:44 +00:00
Athanasius
ee66b9deb1
WiX: Move EDMarketConnector.wixobj to root directory
...
* Don't specify its generation inside dist.win32/
* Specify `-b dist.win32\` to light.exe invocation
Tested with installing resultant .msi over 5.2.3.
2021-12-07 17:16:21 +00:00
Athanasius
97f025e1b9
requirements-dev: Add lxml, used for Windows packaging
2021-12-07 17:08:58 +00:00
Athanasius
a196bfe172
WiX: Autogeneration of EDMarketConnector.wxs fully working
...
* Changed config version to 5.3.0-beta2 to be sure during testing.
* Fixed the case on ChangeLog.md in setup.py py2exe config.
* Replaced all TABs with <4 spaces> in wix/template.wxs.
* Now generating the correct Feature tree in the output file. NB: The
'RegistryEntries' isn't part of the file Components but still needs to
be referenced inside <Feature>.
2021-12-07 16:48:11 +00:00
Athanasius
0af2af344d
WiX: Output to final .wxs to expected filename for next stages
2021-12-07 16:18:26 +00:00
Athanasius
931740f640
WiX: Re-add the hard-coded EDMarketConnector.wxs inside wix/ folder
...
So that it's around for reference.
2021-12-07 16:17:38 +00:00
Athanasius
ff32c299cf
WiX: Insertion of heat.exe produced Components now working
2021-12-07 16:16:27 +00:00
Athanasius
6ed64c9d6b
WiX: .gitignore components.wxs & add template.wxs
...
Also renamed header.wxs to template.wxs in setup.py, as we're going to
insert into the middle of its content, not use it as a simple
concatenated header.
2021-12-07 15:51:38 +00:00
Athanasius
43394b17ff
Initial work on auto-generating WiX Component list
...
* We'll be generating EDMarketConnector.wxs, so remove it from git and
add to .gitignore
* Initial work on using `lxml` to parse in wix/components.wxs, generated
by heat.exe, to pick out what we need, modify it, and eventually
stitch into a generated EDMarketConnector.wxs
2021-12-07 15:27:33 +00:00
Athanasius
f3b5f2b4ed
Pre-Release 5.3.0-beta1: appversion & changelog
2021-12-07 11:28:11 +00:00
Athanasius
342edf57d4
Python: Bump 3.10.1
2021-12-07 11:03:00 +00:00
Athanasius
5b20451209
Revert "Python 3.10: Change tcl/tk DLLs to '*' GUID"
...
This reverts commit 8be6a53f43468198ff36e26cfdeb9625098ca782.
It didn't help and will potentially cause other issues.
2021-12-05 11:34:12 +00:00
Athanasius
8be6a53f43
Python 3.10: Change tcl/tk DLLs to '*' GUID
...
For reasons not logged by:
msiexec /l*vx 5.3.0-beta0-install.txt /i EDMarketConnector_win_5.3.0-beta0.msi
if you install the GitHub-built 5.3.0-beta0 installer in place of 5.2.3
the two files tcl86t.dll & tk86t.dll do not get installed. Other than
WinSparkle.dll (which won't have changed in a long time) they're the
only two DLL files with a hard-coded GUID. So let's try changing them
to '*'.
2021-12-04 09:26:23 +00:00
Athanasius
bb65718cef
Python 3.10: Final adjustments to .wxs file
...
We were missing some new files which seemed to be the cause of issues
with the definitely included and installed _tkinter.pyd. I think it was
due to missing _win32sysloader.pyd but didn't test in detail.
2021-12-03 12:21:36 +00:00
Athanasius
74c2c295bc
Python 3.10: Remove un-necessary pyd files
...
_aynscio.pyd
_multiprocessing.pyd
_overlapped.pyd
They do still exist in Python 3.10, but we don't use them and it seems
py2exe is no longer causing their inclusion in the build.
2021-12-03 11:47:14 +00:00
Athanasius
d546e84031
Python 3.10: Bump py2exe version
2021-12-03 11:40:31 +00:00
Athanasius
3a28945ad5
Python 3.10: Change version number in most of our local files
...
The requirements-dev.txt change for py2exe will be in a separate commit.
2021-12-03 11:17:18 +00:00
Athanasius
42c2167a53
Merge pull request #1363 from EDCD/enhancement/1324/custom-user-agent
...
Set a custom User-Agent header everywhere
2021-11-30 11:25:17 +00:00
Athanasius
4ab6d62926
user_agent: Set this once in config.py and use it everywhere
...
* Also flake8/mypy pass on timeout_session.py
2021-11-29 18:04:56 +00:00
Athanasius
2fd72fde8e
EDSM: Set custom User-Agent for requests session
2021-11-29 17:51:19 +00:00
Athanasius
42fea4ec34
EDDN: Set custom User-Agent
2021-11-29 17:47:25 +00:00
Athanasius
008b807975
Merge pull request #1362 from EDCD/dependabot/pip/develop/coverage-toml--6.2
...
build(deps-dev): bump coverage[toml] from 6.1.2 to 6.2
2021-11-29 17:04:28 +00:00
Athanasius
7b0faab90c
Merge pull request #1361 from EDCD/dependabot/github_actions/develop/actions/setup-python-2.3.1
...
build(deps): bump actions/setup-python from 2.3.0 to 2.3.1
2021-11-29 17:04:21 +00:00
dependabot[bot]
eda2ace51b
build(deps-dev): bump coverage[toml] from 6.1.2 to 6.2
...
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy ) from 6.1.2 to 6.2.
- [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.1.2...6.2 )
---
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-29 17:03:42 +00:00
dependabot[bot]
94a959b0cd
build(deps): bump actions/setup-python from 2.3.0 to 2.3.1
...
Bumps [actions/setup-python](https://github.com/actions/setup-python ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/actions/setup-python/releases )
- [Commits](https://github.com/actions/setup-python/compare/v2.3.0...v2.3.1 )
---
updated-dependencies:
- dependency-name: actions/setup-python
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-29 17:03:28 +00:00
Athanasius
4873bf6eae
Merge pull request #1360 from EDCD/dependabot/pip/develop/types-requests-2.26.1
...
build(deps-dev): bump types-requests from 2.26.0 to 2.26.1
2021-11-26 18:20:08 +00:00
dependabot[bot]
37533ed263
build(deps-dev): bump types-requests from 2.26.0 to 2.26.1
...
Bumps [types-requests](https://github.com/python/typeshed ) from 2.26.0 to 2.26.1.
- [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>
2021-11-26 17:03:47 +00:00
Athanasius
c17716a7f9
develop: Reset appversion to 5.3.0-beta0
2021-11-22 11:09:18 +00:00
Athanasius
2d729ec237
Release 5.2.3: appversion & changelog
2021-11-22 11:08:03 +00:00
Athanasius
c3fd74b968
Updated translations
2021-11-22 11:06:57 +00:00
Athanasius
fe55eb11f8
click_counter: Cast value to int() for saving
2021-11-22 10:57:46 +00:00
Athanasius
71ed90fb3a
Fix click_counter example to work & pass linting
...
* It was returning 'ClickCounter' for the name, mis-matching with the
folder name of 'click_counter', which caused plain logging to be used.
That in turn then complained about the lack of %(osthreadid).
* flake8 pass, including adding doc strings, with references to
PLUGINS.md sections.
* mypy pass.
2021-11-22 10:42:31 +00:00
Athanasius
9f231cc57e
changelog: 5.2.3-beta1: releases -> release
2021-11-21 11:41:39 +00:00
Athanasius
4ee2132589
Pre-Release 5.2.3-beta1: appversion & changelog
2021-11-21 11:33:44 +00:00
Athanasius
ef7e6f81f0
Merge pull request #1355 from EDCD/fix/1354/loadgame-rank-progress-order
...
monitor: Don't re-init Enginers/Rank/Reputation on LoadGame
2021-11-21 11:29:05 +00:00
Athanasius
8363e8c646
monitor: Don't re-init Enginers/Rank/Reputation on LoadGame
...
The order of Journal events changed from:
1. LoadGame
2. Rank
3. Progress
to:
1. Rank
2. Progress
3. LoadGame
in Odyssey, and in at least current 'base game' and Horizons clients as
well. Also 'Reputation' event is before 'LoadGame' now. So simply
allow those events to have populated the data, don't re-init on
LoadGame.
Yes, I'm preferring to leave the lines in, but commented, so it's clear
why those aren't being init'd, *and* why 'Statistics' still is, and as
of what game version.
2021-11-21 11:24:18 +00:00
Athanasius
5a9c36149e
Merge pull request #1352 from EDCD/dependabot/pip/develop/flake8-noqa-1.2.1
...
build(deps-dev): bump flake8-noqa from 1.2.0 to 1.2.1
2021-11-18 18:34:59 +00:00
