Merge pull request #168 from MightyCreak/prepare-release-0.7.6

Prepare files for new release 0.7.6

CHANGELOG.md

@@ -1,16 +1,37 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## 0.7.6 - 2022-10-23
+
+### Added
+
+- Port to Mac OS (thanks to @hugoholgersson)
+
+### Changed
+
+- Documentation: added dev setup for MacOS
+- Documentation: updated the dependencies
+- CI/CD: GitHub actions warnings
+
+### Fixed
+
+- Fixed MyPy errors
+
 ## 0.7.5 - 2022-04-15
 
 ### Added
+
 - Documentation: added release process instructions
 - Translation: added French translation
 
 ### Fixed
+
 - Fixed #156: Preferences cannot be saved in latest release
 - Cleanups: use constructors instead of `new()` whenever possible in GTK
   classes
@@ -18,12 +39,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 0.7.4 - 2022-04-03
 
 ### Added
+
 - Added a `--remove-obsolete` option for the update-translation.py script
 - Added links to VCSs in README.md
 - New keyword in config file: "option"
 - Added instructions to install and run from a custom directory
 
 ### Changed
+
 - Updated the translation files
 - Renamed POTFILES.in to POTFILES
 - Renamed io.github.mightycreak.Diffuse.metadata.xml.in to
@@ -38,73 +61,86 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgrade Flatpak GNOME's runtime to 42
 
 ### Fixed
+
 - Removed the lasting lint errors (i.e. in main.py)
 - Fix Flatpak runtime version in documentation
 
 ## 0.7.3 - 2021-11-22
 
 ### Added
+
 - Added linters (flake8 and mypy) and fixed some errors
 - Added lint jobs for both in the CI
 - Added a flatpak job in the CI
 - Created a requirements.dev.txt just for the developers
 
 ### Changed
+
 - main.py slimmed down by about 5000 lines
 - The new widgets.py is a bit fat though (~4000 lines)
 
 ### Fixed
+
 - The intense code cleaning seems to have fixed a bug with the `-c` argument
   (#120)
 
 ## 0.7.2 - 2021-11-18
 
 ### Added
+
 - New options: log_print_output and log_print_stack, to print the log messages
   on the output and code stack
 - New log function: utils.logErrorAndDialog, to both log and show a dialog
   message
 
 ### Changed
+
 - Modularized the VCSs (reducing main.py by around 1300 lines)
 - Bump GNOME runtime version from 3.38 to 41
 
 ### Fixed
+
 - Fixed 'APP_NAME' error when opening non existing file
 - Fixed the Portuguese Brazilian (pt_BR) translation
 
 ## 0.7.1 - 2021-11-17
 
 ### Fixed
+
 - Fixed #103: the flatpak app can now call binaries on the host, such as `git`,
   `svn`, etc. (PR #105)
 
 ## 0.7.0 - 2021-11-16
 
 ### Added
+
 - Added MetaInfo file
 - New SVG icon (thanks @creepertron95, @jimmac and @freddii)
 - Started modularizing the code
 
 ### Changed
+
 - Changed AppID to io.github.mightycreak.Diffuse (as explained in
   [Flatpak documentation](https://docs.flatpak.org/en/latest/conventions.html#application-ids))
 - Renamed `translations/` to `po/`
 - Now uses POTFILES.in to list the files to translate
-- Translation strings are no longer sorted alphabetically, this will help when there will be
+- Translation strings are no longer sorted alphabetically, this will help when
-  several files in POTFILES.in
+  there will be several files in POTFILES.in
 - Updated the documentation and script in the `po/` directory
 - Add .desktop translations in .po files
 
 ### Fixed
+
 - Fixed some GTK deprecation warnings
 
 ## 0.6.0 - 2020-11-29
 
 ### Added
+
 - New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse
 
 ### Changed
+
 - Replace old install.py with the more standard Meson
 - Remove `u` string prefixes since Python 3 is in UTF-8 by default
 - Replaced some interpolation operators (`%`) for the `f` string prefix
@@ -113,18 +149,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 0.5.0 - 2020-07-18
 
 ### Added
+
 - added Pedro Albuquerque's Portuguese translation
 - added Åke Engelbrektson's Swedish translation
 - added Guillaume Hoffmann's Darcs support improvements
 - added support for Git submodules
 - added Akom Chotiphantawanon's Thai translation
-- added a preference and command line option to specify the version control system search order
+- added a preference and command line option to specify the version control
+  system search order
 - added .editorconfig file
 - added .gitignore file
 - added message when removing files during uninstallation
 - added Python script to update all the translation files at once
 
 ### Changed
+
 - convert to Python 3
 - convert to GTK 3
 - updated Python highlighting for Python 3 grammar
@@ -134,6 +173,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - updated all the translation files
 
 ### Fixed
+
 - fixed wrong icons directory for gtk-update-icon-cache
 - fixed missing directories when uninstalling
 - fixed bug introduced by r420 with RCS VCS
@@ -141,27 +181,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fixed error when using '-m' in an SVN repo
 
 ## 0.4.8 - 2014-07-18
+
 ### Added
+
 - updated use of gtk.SpinButton and gtk.Entry to avoid quirks seen on some platforms
 - updated C/C++ syntax highlighting to recognise C11/C++11 keywords
 - improved image quality of icons
 - added Chi Ming and Wei-Lun Chao's Traditional Chinese translation
 
 ### Fixed
+
 - fixed a bug that prevented Diffuse from reviewing large git merge conflicts
 - fixed a bug that prevented drag-and-drop of file paths with non-ASCII characters
 
 ## 0.4.7 - 2013-05-13
+
 ### Added
+
 - added Jindřich Šesták's Czech translation
-- improved character editing to allow easy indenting and moving the cursor by whole words
+- improved character editing to allow easy indenting and moving the cursor by
+  whole words
 - added Miś Uszatek's Polish translation
 - improved auto-detection of utf_16 and utf_32
 - added "New N-Way File Merge..." menu item
 - added syntax highlighting for Erlang and OpenCL files
 
 ## 0.4.6 - 2011-11-02
+
 ### Added
+
 - added support for Subversion 1.7
 - added "Open Commit..." menu item
 - "-c" option now works for all supported version control systems
@@ -169,10 +217,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added syntax highlighting for R files
 
 ### Fixed
-- fixed a bug that caused the wrong revision to be shown when working on a branch in Mercurial
+
+- fixed a bug that caused the wrong revision to be shown when working on a
+  branch in Mercurial
 
 ## 0.4.5 - 2011-07-13
+
 ### Added
+
 - added syntax highlighting for JSON files
 - added menu items and keyboard shortcuts for "First Tab" and "Last Tab"
 - added "--line" command line option
@@ -182,16 +234,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added Cristian Marchi's Italian translation
 
 ### Changed
+
 - state information is now stored in ~/.local/share/diffuse
 
 ### Fixed
-- fixed a bug in CVS and Subversion support that prevented Diffuse from displaying some removed files
+
+- fixed a bug in CVS and Subversion support that prevented Diffuse from
+  displaying some removed files
 - fixed a bug that caused deleted files to be ignored when using the '-m' option
-- fixed a bug that incorrectly encoded pasted text if utf_8 was not specified in the Region Settings preferences
+- fixed a bug that incorrectly encoded pasted text if utf_8 was not specified in
+  the Region Settings preferences
 - fixed a bug that could cause "Save As..." to fail with some user specified encodings
 
 ## 0.4.4 - 2010-10-21
+
 ### Added
+
 - Git support now recognises conflicts when re-applying the stash
 - search dialog is now automatically populated with the currently selected text
 - added Oleg Pakhtusov's Russian translation
@@ -200,15 +258,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Shift-ScrollWheel can now be used to scroll horizontally
 
 ### Fixed
+
 - double clicking on text can now select full words with non-English characters
 - fixed a bug that prevented opening files with non-ASCII characters in their path
 
 ## 0.4.3 - 2010-04-15
+
 ### Fixed
-- fixed a bug that prevented the "-m" option from opening a 3-way merge for Subversion and Bazaar conflicts
+
+- fixed a bug that prevented the "-m" option from opening a 3-way merge for
+  Subversion and Bazaar conflicts
 
 ## 0.4.2 - 2010-04-13
+
 ### Added
+
 - support for detached Git repositories
 - better removal of unnecessary spacer lines
 - added support for horizontal mouse scrolling
@@ -218,10 +282,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - "#!" interpreter lines are now used to select proper highlighting rules
 
 ### Changed
+
 - syntax highlighting is now indicated by radio menu items
 
 ## 0.4.1 - 2009-10-12
+
 ### Added
+
 - added Japanese translation
 - added Liu Hao's simplified Chinese translation
 - added a 'Dismiss All Edits' menu item
@@ -232,16 +299,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added new menu items and buttons for copying lines between panes
 
 ### Changed
-- personal configuration files are now stored in ~/.config/diffuse/ (the README file describes how to migrate old settings)
+
+- personal configuration files are now stored in ~/.config/diffuse/ (the README
+  file describes how to migrate old settings)
 - Diffuse now quits if no viewers were created with the -m option
-- replaced "Closing last tab quits Diffuse" preference with a "Warn me when closing a tab will quit Diffuse" preference
+- replaced "Closing last tab quits Diffuse" preference with a "Warn me when
+  closing a tab will quit Diffuse" preference
 - MMB on a notebook tab now closes the tab
 - RMB on a notebook tab creates a popup menu to set the current page
 - changed the default hotkeys for merging to reflect the direction text "moves"
 
 ## 0.4.0 - 2009-08-17
+
 ### Added
-- added format menu with new items for changing case, sorting, and manipulating white space
+
+- added format menu with new items for changing case, sorting, and manipulating
+  white space
 - optimised redraws when only the cursor position has changed
 - input methods that use pre-editing can now be used when editing text
 - dead keys can now be used when editing text
@@ -250,15 +323,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added version control section to the manual
 
 ### Changed
+
 - replaced 'Hide end of line characters' preference with 'Show white space characters'
 - errors are now reported in a dialogue instead of printing to stderr
 
 ### Fixed
+
 - graceful handling of non-zero exit codes from 'git status'
 - minor bug fixes
 
 ## 0.3.4 - 2009-07-03
+
 ### Added
+
 - syntax highlighting for .plist, GLSL, SConscript, and SConstruct files
 - status bar now explains how to navigate between modes
 - added labels to indicate syntax highlighting rules, encoding, and format
@@ -268,14 +345,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - renamed the '--python-interpreter=' installer option to '--pythonbin='
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.3.3 - 2009-04-13
+
 ### Fixed
+
 - fixed a bug handling the backspace key with the cursor in the first column
 
 ## 0.3.2 - 2009-04-13
+
 ### Added
+
 - POSIX installer with `--destdir=` and `--files-only` options for packagers
 - vi-like keybindings for line mode
 - `-m` option to open modified files in separate tabs
@@ -289,26 +371,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - mac-style line ending support
 
 ### Changed
+
 - new end of line display behaviour
 - improved organisation of menu items
 - errors are now reported on stderr
 
 ### Fixed
+
 - button bar no longer grabs keyboard focus
+- minor bug fixes
 
 ### Removed
+
 - removed dependence on urllib module
 - removed TODO list
 
-### Fixed
-- minor bug fixes
-
 ## 0.3.1 - 2009-03-05
+
 ### Fixed
+
 - fixed a typo that broke the 'Find...' dialogue
 
 ## 0.3.0 - 2009-03-03
+
 ### Added
+
 - new Windows installer
 - notification on focus change when files change on disk
 - menu items for adjusting indentation
@@ -318,10 +405,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - search settings now persist across sessions
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.2.15 - 2008-12-03
+
 ### Added
+
 - smoother scrolling
 - panes and tabs can now be manually re-organised
 - preferences for tab key behaviour
@@ -334,10 +424,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - reading /etc/diffuserc now optional when using a personal configuration file
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.2.14 - 2008-10-20
+
 ### Added
+
 - svk support
 - syntax files for more file types
 - DOS / Unix line endings now respected in edit operations
@@ -348,32 +441,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - file revisions can now be specified in the open file dialogue
 
 ### Changed
+
 - moved some resources to the preferences dialogue
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.2.13 - 2008-05-16
+
 ### Added
+
 - bazaar, darcs, and monotone support
 - configurable key bindings
 - persistent preference settings
 - optimisations
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.2.12 - 2008-05-06
+
 ### Added
+
 - alternate codecs for reading and writing files
 - more search options
 - editor support for primary selection
 
 ### Fixed
+
 - minor bug fixes
 
 ## 0.2.11 - 2008-04-27
+
 ### Added
+
 - cvs, subversion, git, mercurial support
 - python re-write
 - syntax highlighting
@@ -382,5 +485,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - tabbed viewer panes
 
 ## 0.1.14 - 2006-01-28
+
 ### Added
+
 - initial public release

data/io.github.mightycreak.Diffuse.appdata.xml.in

@@ -25,9 +25,30 @@
 
   <!-- Translators: no need to translate after this comment -->
   <developer_name>Romain Failliot</developer_name>
-  <update_contact>romain.failliot@foolstep.com</update_contact>
+  <update_contact>romain@foolstep.com</update_contact>
 
   <releases>
+    <release version="0.7.6" date="2022-10-23">
+      <description>
+        <p>
+          Add port to Mac OS..
+        </p>
+        <p>Added:</p>
+        <ul>
+          <li>Port to Mac OS (thanks to @hugoholgersson)</li>
+        </ul>
+        <p>Changed:</p>
+        <ul>
+          <li>Documentation: added dev setup for MacOS</li>
+          <li>Documentation: updated the dependencies</li>
+          <li>CI/CD: GitHub actions warnings</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Fixed MyPy errors</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.7.5" date="2022-04-15">
       <description>
         <p>

data/usr/share/gnome/help/diffuse/C/diffuse.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>

data/usr/share/gnome/help/diffuse/cs/diffuse.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>

data/usr/share/gnome/help/diffuse/it/diffuse.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>

data/usr/share/gnome/help/diffuse/ru/diffuse.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>

data/usr/share/omf/diffuse/diffuse-C.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Diffuse User's Manual</title>
-    <date>2022-04-15</date>
+    <date>2022-10-23</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>

data/usr/share/omf/diffuse/diffuse-cs.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Uživatelská příručka programu Diffuse</title>
-    <date>2022-04-15</date>
+    <date>2022-10-23</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.</description>
     <type>manual</type>

data/usr/share/omf/diffuse/diffuse-it.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Manuale utente di Diffuse</title>
-    <date>2022-04-15</date>
+    <date>2022-10-23</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
     <type>manual</type>

data/usr/share/omf/diffuse/diffuse-ru.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
-    <date>2022-04-15</date>
+    <date>2022-10-23</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>

docs/developers/release-process.md

@@ -26,7 +26,8 @@ few manual steps.
    - Create a new `<release>` tag under `<releases>`, fill the `version` and
      `date` attributes
    - Create a new `<description>` tag under the new `<release>` tag
-   - Add one paragraph to sum the release in one sentence (e.g. highlights, ...)
+   - Add a paragraph (`<p>`) to sum the release in one sentence (e.g.
+     highlights, ...)
    - Paste the changes from the changelog and adapt it to HTML
 6. Create new branch and PR
 

meson.build

@@ -1,5 +1,5 @@
 project('diffuse',
-    version: '0.7.5',
+    version: '0.7.6',
     meson_version: '>= 0.50',
     license: 'GPL-2.0-or-later',
     default_options: [ 'warning_level=2' ])

utils/book2manual.xsl

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.7.5">
+ <!ENTITY app-version "0.7.6">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2022-04-15">
+ <!ENTITY date "2022-10-23">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page

windows-installer/build.py

@@ -25,7 +25,7 @@ import platform
 import subprocess
 import sys
 
-VERSION = '0.7.5'
+VERSION = '0.7.6'
 PACKAGE = '1'
 PLATFORM = 'win' + ''.join([c for c in platform.architecture()[0] if c.isdigit()])
 INSTALLER = 'diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)

windows-installer/diffuse.iss

@@ -5,7 +5,7 @@
 [Setup]
 AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.7.5
+AppVerName=Diffuse 0.7.6
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe

windows-installer/diffuse.new.iss

@@ -4,7 +4,7 @@
 
 #define MyAppName "Diffuse"
 #define MyAppGroupName "Diffuse"
-#define MyAppVersion "0.7.5"
+#define MyAppVersion "0.7.6"
 #define MyAppPublisher "Diffuse Team"
 #define MyAppURL "https://github.com/MightyCreak/diffuse/"
 #define MyAppExeName "diffuse.exe"