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

1628 Commits

Author SHA1 Message Date
Athanasius
4c4511a66d plugins/eddb: Remove misleading comments about 'Only use CAPI...'
This is needed for "not even running the game" CAPI update to be useful.
2020-07-21 17:29:03 +01:00
Athanasius
e2c74ed11d plugins/inara: Removed commented out inara_notify_location() code 2020-07-21 17:29:03 +01:00
Athanasius
f7896f3b6a plugins/inara: Track more system/station info, fix URLs
* Track all of: this.system_address, this.system_population,
 this.system_marketid
* Use this.system_address if set (only from journal) for no-dupes Inara
 system URL.
* Added the "'x' if undocked and show system info" functionality from
  EDDB plugin.
* This version will set target station name/link if you request docking
 with it, whether that succeeds or not.  Cleared not only on Undock, but
 also FSDJump and SupercruiseEntry (in case you never actually docked).
* No longer bothering setting system and station URLs from Inara API
 response as we have working ones anyway.  So even those without Inara
 API Key set get the functionality now.
2020-07-21 17:29:03 +01:00
Athanasius
bb28a4fa2f plugins/inara.py: Add two TODOs
* Artie added a 'by-systemaddress' system lookup, use it.
* This means we probably no longer need to update URLs in the
 inara_notify_location() function.
2020-07-21 17:29:03 +01:00
Athanasius
4da1ae331d plugins/inara.py: Track system and station in cmdr_data, and update links
NB: Still need to ensure journal_entry() updates them and links
properly.
2020-07-21 17:29:03 +01:00
Athanasius
9e4fcdc497 Releasing.md: Fixups
* Contributing.md is in parent directory.
2020-07-19 15:14:16 +01:00
Athanasius
329ef42867 Contributing.md: Fixups
* Reference to Version Strings doesn't need 'URL' as text.
* We're in docs, so just 'Contributing.md'.
* Changelog.md is in parent directory.
2020-07-19 15:11:17 +01:00
Athanasius
bdec515ee2 Contributing.md: We're now using Semantic Version strings.
* Add/correct links to Releasing.md.
* Pre-releases must have tags of the correct form now.
* Misc formatting changes, mostly adding a <hr/> between sections.
2020-07-19 15:04:22 +01:00
Athanasius
ead292ee3a Releasing.md: Fix section headings
Why does ##Header only work in the Wiki :P ?
2020-07-19 14:48:25 +01:00
Athanasius
4d39b704cb Releasing.md: Update for fully using Semantic Versions now
* Lots of re-flow formatting for correct line-wrap.
* Change version 'number' to 'string' throughout.
* Example version is now `4.0.2`.
* #Version-Strings here is now *the* definition of the format and rules
 we use.
* Advise forks to use `+<myversion>` to differentiate.
* Point out the extra `edmarketconnector.xml` commit to update `length`.
2020-07-19 14:45:20 +01:00
Athanasius
84da527587 Changed to 'Version Strings' in Releasing.md 2020-07-19 12:40:50 +01:00
Athanasius
3138407e98 Contributing.md: Reference Releasing.md for version string format 2020-07-19 12:38:19 +01:00
Athanasius
bd81f05514 Utilise 'return None' to reduce check_appcast() indentation 2020-07-19 12:06:59 +01:00
Athanasius
739dfec114 Only import tkinter if we're type checking. 2020-07-19 12:05:37 +01:00
Athanasius
3abd4455df Releasing.md: Cursory update for Semantic Versions 2020-07-19 11:45:07 +01:00
Athanasius
4435bb004a Technically could still be frozen with darwin and thus non-Win Sparkle 2020-07-19 11:45:07 +01:00
Athanasius
35f573bc14 Updater class now used for all updates checking
* Updater.__init__() now takes 'provider' argument to specify if we use
 the internal checking code, or the available external code.
* EDMC.py changed to utilise this with internal provider.
* EDMarketConnector.py changed to use internal provider if not frozen,
 else the internal provider.
* Corrected the darwin/MacOS toggling of auto updates checking to actually
 use the Sparkle, not WinSparkle, API call.
* Updater.check_appcast() does the internal checking:
    * class EDMCVersion to hold the information.
    * Returns None on any error, or if it didn't find a newer version.
    * Returns an EDMCVersion object if it found a newer version.
2020-07-19 11:45:07 +01:00
Athanasius
76a6eec69d Updater.check_appcast() added to 'run from source' version
Tested as working with EDMarketConnector.py.
2020-07-19 11:45:07 +01:00
Athanasius
508ed78a25 Use semantic_version.truncate() for appversion_nobuild 2020-07-19 11:45:07 +01:00
Athanasius
ea2c7f6894 Revert accidental change to test update_feed. 2020-07-19 11:45:07 +01:00
Athanasius
1ee8756983 Re-engineering of EDMC.py version update check
* Uses semantic_version.
* Filters on sparkle:os.
* Catches specific exceptions.
2020-07-19 11:45:07 +01:00
Athanasius
af1c313dc3 update.py: Note to redo 'manual' version check 2020-07-19 11:45:07 +01:00
Athanasius
cba673ae12 Correct 'compoun' to 'compound' in 'Release Notes' URL code 2020-07-19 11:45:07 +01:00
Athanasius
66a63597f1 Use appversion_nobuild in 'Release Notes' URL 2020-07-19 11:45:06 +01:00
Athanasius
ef3f14daaa Define appversion_nobuild in config.py for use elsewhere
Already need this in update.py, but will also adjust the 'Release Notes'
URL to use this, not full version.
2020-07-19 11:45:06 +01:00
Athanasius
dc9597fb0c Add comment that appversion must now be valid Semantic Version 2020-07-19 11:45:06 +01:00
Athanasius
560ac5f81a Semantic Version support: py2exe & WinSparkle
* py2exe only supports Major.Minor.Patch(.Revision), so pass only
Major.Minor.Patch to it.  'File version' of generated EXEs will have
a `.0` appended as .Revision.

* Set 'product_version' in py2exe with the full version string.  This
ends up in the EXE 'Product version' property.

* WinSparkle accidentally suppoorts semver -prerelease correctly, but
not +buildmetadata.  So trim the latter off and set that as the version
for checks.
2020-07-19 11:45:06 +01:00
Athanasius
5961bb25e4
Merge pull request #608 from A-UNDERSCORE-D/patch-1
Add flake8 configuration file
2020-07-18 13:43:02 +01:00
A_D
3099a22de4
Add flake8 configuration file
Proposed flake8 configuration file for all developers to use
2020-07-18 14:38:58 +02:00
Athanasius
ad642f2849 Merge branch 'main' into develop 2020-07-15 12:04:09 +01:00
Athanasius
f7aa85a02d Merge branch 'stable' into main 2020-07-15 12:03:47 +01:00
Athanasius
d39d78bb39 Release 4.0.2.0 Release/4.0.2.0 2020-07-15 12:00:03 +01:00
Athanasius
43e18c0c84 Merge branch 'stable' into main 2020-07-15 11:50:39 +01:00
Athanasius
8759dd4912 Merge branch 'main' of https://github.com/EDCD/EDMarketConnector into main 2020-07-15 11:50:15 +01:00
Athanasius
09be5505bc Clarify what stable and beta branches may contain. Describe release tags.
* Both `stable` and `beta` might contain extra commits for hotfixes beyond
what is currently released.
* Describe the Stable Release tag form, and point out that currently
the pre-release tag form is the same.
2020-07-15 11:48:33 +01:00
Athanasius
1a16d6971a docs/Releasing.md: re-structure and clarifications.
I'd been deviating slightly from what it said, so I've updated to what I
now actually do.
2020-07-15 11:48:33 +01:00
Athanasius
1781b6657c Contributing.md: beta can lag behind main/stable/develop 2020-07-15 11:48:33 +01:00
Athanasius
996f317130 Contributing.md: master is deprecated, use main. 2020-07-15 11:48:33 +01:00
Athanasius
1bf8e292a8
Merge pull request #606 from EDCD/fix/604-EDMC-version-check
Restore 'EDMC -v' to announcing newer versions.
2020-07-15 11:46:43 +01:00
Athanasius
c51ba1c445 Clarify what stable and beta branches may contain. Describe release tags.
* Both `stable` and `beta` might contain extra commits for hotfixes beyond
what is currently released.
* Describe the Stable Release tag form, and point out that currently
the pre-release tag form is the same.
2020-07-15 10:43:30 +01:00
Athanasius
b1e1fc3a34 Restore 'EDMC -v' to announcing newer versions.
I got too enthusiastic in 3ff77c3c54dea4bf36d957cd2dbd5b1b02dcb094 when
I removed the "cut it down to A.BC" code.  This restores the old output,
but using a less confusing if/else.
2020-07-15 10:27:29 +01:00
Athanasius
a5becb7f7c Merge branch 'stable' into main 2020-07-14 11:43:57 +01:00
Athanasius
173733cc44 Merge branch 'stable' into develop 2020-07-14 11:43:30 +01:00
Athanasius
6f004e6df7
Merge pull request #602 from EDCD/release-4.0.1.0
Release 4.0.1.0
2020-07-14 11:36:40 +01:00
Athanasius
87530e32b1 edmarketconnector.xml: 4.0.1.0 Release/4.0.1.0 2020-07-14 11:34:26 +01:00
Athanasius
07b6002775 Release 4.0.1.0 appversion and ChangeLog.md 2020-07-14 11:27:55 +01:00
Athanasius
ec32849a17 plugins/eddb: Fallback to system_name if no system_address
* Cleans up imports.
* Fixes some '<tab># ...' to use 2 spaces.
* Add type hints to system_url().
* Always store, even if not current provider: this.{system_address,
  station_marketid,system_population}
2020-07-13 22:12:29 +01:00
Athanasius
f3e25f0340 EDDB system URL: Don't pick up system_address from CAPI at all 2020-07-13 21:03:57 +01:00
Athanasius
0d045d54f4 docs/Releasing.md: re-structure and clarifications.
I'd been deviating slightly from what it said, so I've updated to what I
now actually do.
2020-07-13 17:46:57 +01:00
Athanasius
f95e55d3d4 Contributing.md: beta can lag behind main/stable/develop 2020-07-13 13:40:34 +01:00