ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-10-29 01:26:08 +03:00
Code Issues Projects Releases Wiki Activity
4,780 Commits 12 Branches 299 Tags
7ca650ba5bddd2d01fd700d3a29f0b10ebf0a50f
Commit Graph
4780 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius 7ca650ba5b develop: post-release version bump to 5.5.1-alpha0 2022-09-26 12:46:28 +01:00
Athanasius 2fba41c082 Release 5.5.0: appversion & changelog Release/5.5.0 2022-09-26 10:33:54 +01:00
Athanasius c06d0913b4 Merge pull request #1670 from EDCD/enhancement/1364/py2exe-with-setuptools-freeze.py 
Migrate to new `py2exe` build API
 2022-09-24 18:14:39 +01:00
Athanasius 26c2bd720f Build: Enforce win32 only at top-level, and clean up how error is raised 
* Repeating the same test is just un-necessary, bad past-Ath.
* Use `raise AssertionError(...)`.

I'd move some of this stuff into functions, but it wouldn't actually
aid readability.
 2022-09-24 11:05:01 +01:00
Athanasius 9347f12723 build: Remove old setup.py and py2exe.cmd 
Use the git, Ath.
 2022-09-24 11:05:00 +01:00
Athanasius a3198c5e36 Build: Remove all of the macOS code & comment out sections 
* We've not been building for macOS since the change of maintainership in
  2020, so removing that code is long overdue.

  However we're leaving in the test for `win32` so as to be explicit that
  this should only (currently) be run on that platform.

* Add section comments to better document what each code section is meant
  to achieve.
 2022-09-24 11:05:00 +01:00
Athanasius a9ef736067 Build: Use version_info for DRYness 
* Adds `language` so that WiX is happy.  Hard-coded to "English (United
  States)".
* Also adds `description` (same as the GitHub repo).
 2022-09-24 11:05:00 +01:00
Athanasius f4f0c77821 docs/Releasing: Update for using Build-exe-and-msi.py 2022-09-24 11:05:00 +01:00
Athanasius 8eaf1ec70f windows-build: Switch github workflow to freeze method 2022-09-24 11:05:00 +01:00
Athanasius 05d6160427 Rename py2exe-build.py to Build-exe-and-msi.py 
This name is more indicative of the functionality.
 2022-09-24 11:04:59 +01:00
Athanasius 6ad6c90213 First cut at utilising a possible new py2exe API/paradigm 
See https://github.com/py2exe/py2exe/issues/127 for context

This filename is still open to change, I don't want to just use `freeze.py`,
as that seems too potentially ambiguous.
 2022-09-24 11:04:59 +01:00
Athanasius c1c706fc89 Merge pull request #1669 from EDCD/dependabot/pip/develop/types-requests-2.28.11 
build(deps-dev): bump types-requests from 2.28.10 to 2.28.11
 2022-09-23 11:11:19 +01:00
dependabot[bot] a71ce9c03f build(deps-dev): bump types-requests from 2.28.10 to 2.28.11 
Bumps [types-requests](https://github.com/python/typeshed) from 2.28.10 to 2.28.11.
- [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-09-22 17:04:35 +00:00
Athanasius 2877cdc8dd Merge pull request #1667 from EDCD/dependabot/pip/develop/py2exe-0.12.0.1 
build(deps-dev): bump py2exe from 0.11.1.1 to 0.12.0.1
 2022-09-20 18:53:20 +01:00
Athanasius 6a6710b46c Merge pull request #1668 from EDCD/dependabot/pip/develop/safety-2.2.0 
build(deps-dev): bump safety from 2.1.1 to 2.2.0
 2022-09-20 18:50:33 +01:00
dependabot[bot] 3a8cf13c5c build(deps-dev): bump safety from 2.1.1 to 2.2.0 
Bumps [safety](https://github.com/pyupio/safety) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/pyupio/safety/releases)
- [Changelog](https://github.com/pyupio/safety/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/pyupio/safety/compare/2.1.1...2.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-20 17:45:44 +00:00
dependabot[bot] 75d47530e0 build(deps-dev): bump py2exe from 0.11.1.1 to 0.12.0.1 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.11.1.1 to 0.12.0.1.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.11.1.1...v0.12.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-20 17:45:40 +00:00
Athanasius 03a210a514 Revert "build(deps-dev): bump py2exe from 0.11.1.1 to 0.12.0.0" 
This reverts commit 6d11bcfb35.

0.12.0.0 has broken the now deprecated `setup()` interface, so we'll wait
to confirm that's unbroken and *then* move to the new `freeze()` API.
 2022-09-20 11:52:58 +01:00
Athanasius 20dcfb96af Merge pull request #1666 from EDCD/dependabot/pip/develop/py2exe-0.12.0.0 
build(deps-dev): bump py2exe from 0.11.1.1 to 0.12.0.0
 2022-09-20 11:28:18 +01:00
dependabot[bot] 6d11bcfb35 build(deps-dev): bump py2exe from 0.11.1.1 to 0.12.0.0 
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.11.1.1 to 0.12.0.0.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.11.1.1...v0.12.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-19 17:04:40 +00:00
Athanasius ee8a8d56b2 Merge pull request #1664 from EDCD/dependabot/pip/develop/certifi-2022.9.14 
build(deps): bump certifi from 2022.6.15.2 to 2022.9.14
 2022-09-15 18:09:23 +01:00
dependabot[bot] b88bbb8e9b build(deps): bump certifi from 2022.6.15.2 to 2022.9.14 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.6.15.2 to 2022.9.14.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2022.06.15.2...2022.09.14)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-15 17:07:47 +00:00
Athanasius 3a1b58c8e8 Merge pull request #1663 from EDCD/dependabot/pip/develop/certifi-2022.6.15.2 
build(deps): bump certifi from 2022.6.15.1 to 2022.6.15.2
 2022-09-14 18:09:32 +01:00
dependabot[bot] a8551444bc build(deps): bump certifi from 2022.6.15.1 to 2022.6.15.2 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.6.15.1 to 2022.6.15.2.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2022.06.15.1...2022.06.15.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-14 17:05:15 +00:00
Athanasius eb7965a6c0 .flake8: exclude .git/ 2022-09-10 15:42:27 +01:00
Athanasius 3a3b0246f7 .flake8: Ignore directories it doesn't need to poke at 2022-09-10 15:40:39 +01:00
Athanasius 3cf8dd8624 Merge pull request #1661 from EDCD/dependabot/pip/develop/certifi-2022.6.15.1 
build(deps): bump certifi from 2022.6.15 to 2022.6.15.1
 2022-09-09 18:05:14 +01:00
Athanasius beada2d39b Merge pull request #1660 from EDCD/dependabot/pip/develop/types-requests-2.28.10 
build(deps-dev): bump types-requests from 2.28.9 to 2.28.10
 2022-09-09 18:04:48 +01:00
dependabot[bot] f8791d0525 build(deps): bump certifi from 2022.6.15 to 2022.6.15.1 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.6.15 to 2022.6.15.1.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2022.06.15...2022.06.15.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-09 17:03:41 +00:00
dependabot[bot] d4efe7f201 build(deps-dev): bump types-requests from 2.28.9 to 2.28.10 
Bumps [types-requests](https://github.com/python/typeshed) from 2.28.9 to 2.28.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-09-09 17:03:37 +00:00
Athanasius db63ae7f98 python: Bump to version 3.10.7 2022-09-07 18:05:21 +01:00
Athanasius 3deb6e2d4a Merge pull request #1657 from EDCD/fix/tests/TestJournalLock.test_release_lock 
Finally(?) ensure all the tests work, no contamination or races
 2022-09-07 14:19:56 +01:00
Athanasius 5a0e31436b tests: journal_lock: Works 100% on Linux, remove 'plan' docstring text 2022-09-07 12:27:35 +01:00
Athanasius 480b0712dd tests: journal_lock: Close filehandle in test_obtain_lock_already_locked() 
After the test completes as expected (ALREADY_LOCKED), ensure we close the
filehandle for that, else it seems to interfere with the sub-process
cleanup, which then leads to subsequent tests not being able to cleanup.

Tests as now working after 10s of runs of `pytest` in a loop.
 2022-09-07 12:21:57 +01:00
Athanasius 77e7f71ee3 tests: journal_lock: Add, and use, _release_lock() to fix TestJournalLock.test_release_lock 
Because the `with ...` was leaving the file locked it then couldn't be
`os.unlink()`'d.
 2022-09-07 12:03:50 +01:00
Athanasius 3c30b34d39 Merge pull request #1653 from EDCD/enhancement/1595/eddn-fcmaterials-journal 
EDDN: Implement Journal-based `fcmaterials/1` schema
 2022-09-06 15:14:42 +01:00
Athanasius 9f8d9045e7 Merge pull request #1656 from EDCD/fix/tests/journal_lock 
Fix up the journal_lock tests for pytest temporary directory factory changes
 2022-09-05 19:52:41 +01:00
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