Merge pull request #222 from MightyCreak/update-to-gnome-45

chore: update flatpak manifest

Author: MightyCreak

CHANGELOG.md

@@ -7,13 +7,19 @@ 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)
 
 ### 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
 

docs/developers/release-process.md

@@ -44,9 +44,27 @@ few manual steps.
 ## Create new release on Flatpak
 
 1. Clone the Flathub repository: <https://github.com/flathub/io.github.mightycreak.Diffuse>
-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: <https://flathub.org/builds/>
-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: <tag>
+            commit: <tag_commit>
+     ```
+
+   - Replace `<tag>` with the release tag (e.g. `v1.2.3`)
+   - Replace `<tag_commit>` with the release tag commit (e.g. `c0cefac1c4ab99a309b65002e820f5c815e368e1`)
+4. Create commit with changes and push to `main`
+5. Check the build on Flathub: <https://flathub.org/builds/>
+6. When it's done and successful, publish the build

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

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