1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 09:10:35 +03:00

4256 Commits

Author SHA1 Message Date
Athanasius
dfa8051f42
python: Bump to 3.10.2
Confirmed working with a build+run.  CAPI update works, Inara plugin
works, Settings open without issues....
2022-01-20 13:32:01 +00:00
Athanasius
2e50f357ee
config.py: Bump to 5.3.0-beta4 to ensure I'm testing 3.10.2 build 2022-01-20 13:28:47 +00:00
Athanasius
cb1bd5a08f
Merge pull request #1402 from EDCD/dependabot/pip/develop/types-requests-2.27.7
build(deps-dev): bump types-requests from 2.27.6 to 2.27.7
2022-01-14 17:12:21 +00:00
dependabot[bot]
65c806ea97
build(deps-dev): bump types-requests from 2.27.6 to 2.27.7
Bumps [types-requests](https://github.com/python/typeshed) from 2.27.6 to 2.27.7.
- [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-01-14 17:06:26 +00:00
Athanasius
fa94ad43f6
Merge pull request #1400 from EDCD/dependabot/pip/develop/types-requests-2.27.6
build(deps-dev): bump types-requests from 2.27.5 to 2.27.6
2022-01-12 17:04:52 +00:00
dependabot[bot]
fcf2ccfded
build(deps-dev): bump types-requests from 2.27.5 to 2.27.6
Bumps [types-requests](https://github.com/python/typeshed) from 2.27.5 to 2.27.6.
- [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-01-12 17:04:01 +00:00
Athanasius
a850407107
Merge pull request #1399 from EDCD/dependabot/pip/develop/flake8-comprehensions-3.8.0
build(deps-dev): bump flake8-comprehensions from 3.7.0 to 3.8.0
2022-01-11 17:07:53 +00:00
dependabot[bot]
f422d1efe7
build(deps-dev): bump flake8-comprehensions from 3.7.0 to 3.8.0
Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases)
- [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst)
- [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.7.0...3.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-11 17:03:24 +00:00
Athanasius
5b328c392c
Merge pull request #1397 from EDCD/dependabot/pip/develop/types-requests-2.27.5
build(deps-dev): bump types-requests from 2.27.1 to 2.27.5
2022-01-10 17:05:18 +00:00
dependabot[bot]
6798c08384
build(deps-dev): bump types-requests from 2.27.1 to 2.27.5
Bumps [types-requests](https://github.com/python/typeshed) from 2.27.1 to 2.27.5.
- [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-01-10 17:03:58 +00:00
Athanasius
4b6a60c249
Merge pull request #1392 from EDCD/dependabot/pip/develop/types-requests-2.27.1
build(deps-dev): bump types-requests from 2.26.3 to 2.27.1
2022-01-07 17:07:25 +00:00
Athanasius
96169283db
Merge pull request #1391 from EDCD/dependabot/pip/develop/mypy-0.931
build(deps-dev): bump mypy from 0.930 to 0.931
2022-01-07 17:07:14 +00:00
dependabot[bot]
9a590f700e
build(deps-dev): bump types-requests from 2.26.3 to 2.27.1
Bumps [types-requests](https://github.com/python/typeshed) from 2.26.3 to 2.27.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-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-07 17:03:58 +00:00
dependabot[bot]
a5affe3436
build(deps-dev): bump mypy from 0.930 to 0.931
Bumps [mypy](https://github.com/python/mypy) from 0.930 to 0.931.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.930...v0.931)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-07 17:03:52 +00:00
Athanasius
799ea722b1
Merge pull request #1389 from EDCD/dependabot/pip/develop/requests-2.27.1
build(deps): bump requests from 2.27.0 to 2.27.1
2022-01-05 17:05:24 +00:00
dependabot[bot]
6c67435b8a
build(deps): bump requests from 2.27.0 to 2.27.1
Bumps [requests](https://github.com/psf/requests) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.27.0...v2.27.1)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-05 17:03:51 +00:00
Athanasius
e6e209ba1b
Merge pull request #1388 from EDCD/dependabot/pip/develop/requests-2.27.0
build(deps): bump requests from 2.26.0 to 2.27.0
2022-01-03 17:08:00 +00:00
dependabot[bot]
ee5f80cde1
build(deps): bump requests from 2.26.0 to 2.27.0
Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.26.0...v2.27.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-03 17:05:45 +00:00
Athanasius
5589c16dea
config: Bump copyright end year 2021-12-31 20:24:07 +00:00
Athanasius
46f1fccc5f
Merge pull request #1383 from EDCD/dependabot/pip/develop/types-requests-2.26.3
build(deps-dev): bump types-requests from 2.26.2 to 2.26.3
2021-12-29 13:09:24 +00:00
dependabot[bot]
997adf332a
build(deps-dev): bump types-requests from 2.26.2 to 2.26.3
Bumps [types-requests](https://github.com/python/typeshed) from 2.26.2 to 2.26.3.
- [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-12-28 17:03:31 +00:00
Athanasius
c7706c20b5
Merge pull request #1382 from EDCD/dependabot/pip/develop/mypy-0.930
build(deps-dev): bump mypy from 0.921 to 0.930
2021-12-23 17:04:10 +00:00
dependabot[bot]
04bba0dda2
build(deps-dev): bump mypy from 0.921 to 0.930
Bumps [mypy](https://github.com/python/mypy) from 0.921 to 0.930.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.921...v0.930)

---
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-23 17:03:19 +00:00
Athanasius
6094d46c7e
Merge pull request #1381 from EDCD/dependabot/pip/develop/mypy-0.921
build(deps-dev): bump mypy from 0.920 to 0.921
2021-12-22 17:08:18 +00:00
Athanasius
9b5626b637
Merge pull request #1380 from EDCD/dependabot/pip/develop/pywin32-303
build(deps-dev): bump pywin32 from 302 to 303
2021-12-22 17:08:11 +00:00
dependabot[bot]
0f0a4211ee
build(deps-dev): bump mypy from 0.920 to 0.921
Bumps [mypy](https://github.com/python/mypy) from 0.920 to 0.921.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.920...v0.921)

---
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-22 17:03:30 +00:00
dependabot[bot]
b74bf63076
build(deps-dev): bump pywin32 from 302 to 303
Bumps [pywin32](https://github.com/mhammond/pywin32) from 302 to 303.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 17:04:26 +00:00
Athanasius
60b0c7e014
Merge pull request #1377 from EDCD/dependabot/pip/develop/types-requests-2.26.2
build(deps-dev): bump types-requests from 2.26.1 to 2.26.2
2021-12-18 12:31:31 +00:00
Athanasius
aedab720ab
Merge pull request #1376 from EDCD/enhancement/1372/fdevids
Switch to using data files from FDevIDs submodule
2021-12-18 12:30:54 +00:00
dependabot[bot]
36c0bc10fd
build(deps-dev): bump types-requests from 2.26.1 to 2.26.2
Bumps [types-requests](https://github.com/python/typeshed) from 2.26.1 to 2.26.2.
- [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-12-17 17:03:37 +00:00
Athanasius
da4ae24440
Document use of *local* outfitting.csv instead of FDevIDs version
That's in collate.py and coriolis.py docstrings.
2021-12-17 12:23:20 +00:00
Athanasius
c45b99a180
Remove local copies of (rare_)commodity.csv in favour of FDevIDs versions
NB: Keeping the local outfitting.csv for now due to how it's used (both
input and output in collate.py, input in coriolis.py).
2021-12-17 12:17:07 +00:00
Athanasius
77e89a9df1
setup.py: Properly include FDevIDs files
I have my doubts about the darwin section, but we never package for it
any more, so I'm not going to worry about it now.
2021-12-17 12:00:49 +00:00
Athanasius
1d3ff006cd
collate.py: Correction so it works with dump/ files
And adjust the dile docstring to point out it will only work with the
dump/ file format, not the new 'File > Save Raw Data' one.
2021-12-17 11:35:00 +00:00
Athanasius
3384412632
collapre.py: flake8/mypy fixups 2021-12-17 11:12:55 +00:00
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 Release/5.3.0-beta2 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