From d65edf5f30275de52d5d5967292010b845b2378d Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 6 Jan 2024 20:13:07 -0500 Subject: [PATCH 1/2] fix(linter): fix new flake8 errors --- CHANGELOG.md | 1 + src/diffuse/utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b961c68..57e0b92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fix compatibility with Python 3.12: remove use of `distutils` (@MightyCreak) +- Fix new errors raised by Flake8 (@MightyCreak) ## 0.8.2 - 2023-04-16 diff --git a/src/diffuse/utils.py b/src/diffuse/utils.py index b4fdc11..fae8192 100644 --- a/src/diffuse/utils.py +++ b/src/diffuse/utils.py @@ -185,7 +185,7 @@ def popenRead( prefs.convertToNativePath('/bin/bash.exe'), '-l', '-c', - f"cd {_bash_escape(cwd)}; {' '.join([ _bash_escape(arg) for arg in cmd ])}" + f"cd {_bash_escape(cwd)}; {' '.join([_bash_escape(arg) for arg in cmd])}" ] opt_cwd = None From 3a13b5325b62832d4b0b7051462d801a7f7b4d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sun, 7 Jan 2024 02:48:26 +0300 Subject: [PATCH 2/2] chore: update flatpak manifest - Update to GNOME platform 45 - Activate test on build process --- CHANGELOG.md | 5 +++++ docs/developers/release-process.md | 30 ++++++++++++++++++++++++------ io.github.mightycreak.Diffuse.yml | 5 +++-- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57e0b92..9e7f960 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed + +- Update from GNOME 44 to 45 (@sabriunal) +- Flatpak manifest now runs the tests (@sabriunal) + ### Removed - Remove support for the SVK CVS (@MightyCreak) diff --git a/docs/developers/release-process.md b/docs/developers/release-process.md index b75a1bb..ebb0ef0 100644 --- a/docs/developers/release-process.md +++ b/docs/developers/release-process.md @@ -44,9 +44,27 @@ few manual steps. ## Create new release on Flatpak 1. Clone the Flathub repository: -2. Copy the contents of Diffuse's `io.github.mightycreak.Diffuse.yml` to Flathub's -3. Keep Flathub's `config-opts` and `sources` sections -4. In `sources` section, change the `commit` and `tag` -5. Create commit with changes and push to `master` -6. Check the build on Flathub: -7. When it's done and successful, publish the build +2. Copy the contents of `io.github.mightycreak.Diffuse.yml` in Diffuse repository + to Flathub's +3. Edit the file: + - Replace the content of the `diffuse` module with these lines: + + ```yaml + - name: diffuse + builddir: true + buildsystem: meson + config-opts: + - -Dlog_print_output=true + - -Duse_flatpak=true + sources: + - type: git + url: https://github.com/MightyCreak/diffuse + tag: + commit: + ``` + + - Replace `` with the release tag (e.g. `v1.2.3`) + - Replace `` with the release tag commit (e.g. `c0cefac1c4ab99a309b65002e820f5c815e368e1`) +4. Create commit with changes and push to `main` +5. Check the build on Flathub: +6. When it's done and successful, publish the build diff --git a/io.github.mightycreak.Diffuse.yml b/io.github.mightycreak.Diffuse.yml index 122a6f6..49c4a7c 100644 --- a/io.github.mightycreak.Diffuse.yml +++ b/io.github.mightycreak.Diffuse.yml @@ -1,6 +1,6 @@ app-id: io.github.mightycreak.Diffuse runtime: org.gnome.Platform -runtime-version: '44' +runtime-version: '45' sdk: org.gnome.Sdk command: diffuse finish-args: @@ -12,8 +12,9 @@ finish-args: - --talk-name=org.freedesktop.Flatpak modules: - name: diffuse - builddir: true buildsystem: meson + builddir: true + run-tests: true config-opts: - -Dlog_print_output=true - -Dlog_print_stack=true