Merge pull request #362 from mweinelt/version-parser-fix

Properly fix version handling with packaging>=22.0
Merge pull request #359 from azlux/dependabot/npm_and_yarn/web/yaml-and-postcss-loader--removed
2024-11-23 22:06:09 +00:00 · 2023-05-29 10:14:45 -04:00 · 2023-05-29 10:12:37 -04:00 · 2023-05-29 10:11:23 -04:00 · 2023-05-29 10:11:14 -04:00 · 2023-05-29 10:11:05 -04:00
3 changed files with 631 additions and 354 deletions
--- a/mumbleBot.py
+++ b/mumbleBot.py
@ -195,12 +195,14 @@ class MumbleBot:
            th.start()

        last_startup_version = var.db.get("bot", "version", fallback=None)
-        if self.version != "git":
+        try:
            if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version):
                var.db.set("bot", "version", self.version)
                if var.config.getboolean("bot", "auto_check_update"):
                    changelog = util.fetch_changelog()
                    self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog))
+        except version.InvalidVersion:
+            var.db.set("bot", "version", self.version)

    # Set the CTRL+C shortcut
    def ctrl_caught(self, signal, frame):
--- a/web/package-lock.json
+++ b/web/package-lock.json
--- a/web/package.json
+++ b/web/package.json
@ -33,7 +33,7 @@
    "eslint-plugin-jsdoc": "^30.7.8",
    "html-webpack-plugin": "^4.5.0",
    "mini-css-extract-plugin": "^1.3.1",
-    "postcss-loader": "^4.1.0",
+    "postcss-loader": "^7.2.4",
    "regenerator-runtime": "^0.13.7",
    "sass": "^1.29.0",
    "sass-loader": "^10.1.0",
Author	SHA1	Message	Date
Terry Geng	bd9f9bc432	Merge pull request #362 from mweinelt/version-parser-fix Properly fix version handling with packaging>=22.0	2023-05-29 10:14:45 -04:00
Terry Geng	9f83cec7bf	Merge pull request #359 from azlux/dependabot/npm_and_yarn/web/yaml-and-postcss-loader--removed build(deps): bump yaml and postcss-loader in /web	2023-05-29 10:12:37 -04:00
Terry Geng	898082714a	Merge pull request #347 from azlux/dependabot/npm_and_yarn/web/ansi-regex-and-ansi-regex-5.0.1 build(deps): bump ansi-regex in /web	2023-05-29 10:11:23 -04:00
Terry Geng	524df97578	Merge pull request #352 from azlux/dependabot/npm_and_yarn/web/minimatch-3.1.2 build(deps): bump minimatch from 3.0.4 to 3.1.2 in /web	2023-05-29 10:11:14 -04:00
Terry Geng	dd99f21d7b	Merge pull request #346 from azlux/dependabot/npm_and_yarn/web/nth-check-and-renderkid-2.1.1 build(deps): bump nth-check and renderkid in /web	2023-05-29 10:11:05 -04:00
Martin Weinelt	2a204988c3	Properly fix version handling with packaging>=22.0 Both the current version and the last startup version can be unparsable. Hence we now just catch the resulting exception and reset the version to the new version, which may or may not be parsable, which we'll find out on the next start up. But either way this prevents crashes from unparsable versions in the database.	2023-05-29 16:03:47 +02:00
dependabot[bot]	88f04e5f6f	build(deps): bump yaml and postcss-loader in /web Removes [yaml](https://github.com/eemeli/yaml). It's no longer used after updating ancestor dependency [postcss-loader](https://github.com/webpack-contrib/postcss-loader). These dependencies need to be updated together. Removes `yaml` Updates `postcss-loader` from 4.1.0 to 7.2.4 - [Release notes](https://github.com/webpack-contrib/postcss-loader/releases) - [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v4.1.0...v7.2.4) --- updated-dependencies: - dependency-name: yaml dependency-type: indirect - dependency-name: postcss-loader dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-24 19:10:45 +00:00
dependabot[bot]	85f9a80b1b	build(deps): bump minimatch from 3.0.4 to 3.1.2 in /web Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-09 13:37:18 +00:00
dependabot[bot]	08951e8d93	build(deps): bump ansi-regex in /web Bumps [ansi-regex](https://github.com/chalk/ansi-regex) and [ansi-regex](https://github.com/chalk/ansi-regex). These dependencies needed to be updated together. Updates `ansi-regex` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1) Updates `ansi-regex` from 4.1.0 to 5.0.1 - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-08 20:15:14 +00:00
dependabot[bot]	9aaa8ccf93	build(deps): bump nth-check and renderkid in /web Bumps [nth-check](https://github.com/fb55/nth-check) and [renderkid](https://github.com/AriaMinaei/RenderKid). These dependencies needed to be updated together. Updates `nth-check` from 1.0.2 to 2.1.1 - [Release notes](https://github.com/fb55/nth-check/releases) - [Commits](https://github.com/fb55/nth-check/compare/v1.0.2...v2.1.1) Updates `renderkid` from 2.0.4 to 2.0.7 - [Release notes](https://github.com/AriaMinaei/RenderKid/releases) - [Commits](https://github.com/AriaMinaei/RenderKid/compare/2.0.4...2.0.7) --- updated-dependencies: - dependency-name: nth-check dependency-type: indirect - dependency-name: renderkid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-08 20:15:14 +00:00