Merge pull request #126 from MightyCreak/prepare-for-release-0.7.3

MightyCreak · web-flow · commit 22b1c9bdb00e · 2021-11-22T21:16:02.000-05:00
Prepare for release v0.7.3
diff --git a/.editorconfig b/.editorconfig
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
+[*.{yml,yaml,xml,xml.in}]
 indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,14 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.3] - 2021-11-22
+
 ### Added
-- Added a linter (pylint) and fixed some errors
-- Added a lint job in the CI
+- Added linters (flake8 and mypy) and fixed some errors
+- Added lint jobs for both in the CI
 - Added a flatpak job in the CI
 
 ### Changed
 - main.py slimmed down by about 5000 lines
 - The new widgets.py is a bit fat though (~4000 lines)
+- Updated the translation files
 
 ### Fixed
 - The intense code cleaning seems to have fixed a bug with the `-c` argument
diff --git a/data/io.github.mightycreak.Diffuse.metainfo.xml.in b/data/io.github.mightycreak.Diffuse.metainfo.xml.in
@@ -21,6 +21,31 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.7.3" date="2021-11-22">
+      <description>
+        <p>
+          Patch release that introduces linters (flake8 and mypy).
+        </p>
+        <p>Added:</p>
+        <ul>
+          <li>Added linters (flake8 and mypy) and fixed some errors</li>
+          <li>Added lint jobs for both in the CI</li>
+          <li>Added a flatpak job in the CI</li>
+        </ul>
+        <p>Changed:</p>
+        <ul>
+          <li>main.py slimmed down by about 5000 lines</li>
+          <li>The new widgets.py is a bit fat though (~4000 lines)</li>
+          <li>Updated the translation files</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>
+            The intense code cleaning seems to have fixed a bug with the `-c` argument (#120)
+          </li>
+        </ul>
+      </description>
+    </release>
     <release version="0.7.2" date="2021-11-18">
       <description>
         <p>
diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/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.2">
+  <!ENTITY app-version "0.7.3">
   <!ENTITY app-year "2006-2021">
   <!ENTITY manual-year "2009-2021">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/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.2">
+  <!ENTITY app-version "0.7.3">
   <!ENTITY app-year "2006-2021">
   <!ENTITY manual-year "2009-2021">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/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.2">
+  <!ENTITY app-version "0.7.3">
   <!ENTITY app-year "2006-2021">
   <!ENTITY manual-year "2009-2021">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/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.2">
+  <!ENTITY app-version "0.7.3">
   <!ENTITY app-year "2006-2021">
   <!ENTITY manual-year "2009-2021">
 ]>
diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/usr/share/omf/diffuse/diffuse-C.omf
@@ -5,7 +5,7 @@
     <maintainer>Derrick Moser</maintainer>
     <title>Diffuse User's Manual</title>
     <date>2021-11-17</date>
-    <version identifier="0.7.2" date="2021-11-18"/>
+    <version identifier="0.7.3" date="2021-11-22"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/usr/share/omf/diffuse/diffuse-cs.omf
@@ -5,7 +5,7 @@
     <maintainer>Derrick Moser</maintainer>
     <title>Uživatelská příručka programu Diffuse</title>
     <date>2021-11-17</date>
-    <version identifier="0.7.2" date="2021-11-18"/>
+    <version identifier="0.7.3" date="2021-11-22"/>
     <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>
diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/usr/share/omf/diffuse/diffuse-it.omf
@@ -5,7 +5,7 @@
     <maintainer>Derrick Moser</maintainer>
     <title>Manuale utente di Diffuse</title>
     <date>2021-11-17</date>
-    <version identifier="0.7.2" date="2021-11-18"/>
+    <version identifier="0.7.3" date="2021-11-22"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf
@@ -5,7 +5,7 @@
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
     <date>2021-11-17</date>
-    <version identifier="0.7.2" date="2021-11-18"/>
+    <version identifier="0.7.3" date="2021-11-22"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('diffuse',
-    version: '0.7.2',
+    version: '0.7.3',
     meson_version: '>= 0.50',
     license: 'GPL-2.0-or-later',
     default_options: [ 'warning_level=2' ])
diff --git a/utils/book2manual.xsl b/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.2">
+ <!ENTITY app-version "0.7.3">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2021-11-18">
+ <!ENTITY date "2021-11-22">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page
diff --git a/windows-installer/build.py b/windows-installer/build.py
@@ -25,7 +25,7 @@
 import subprocess
 import sys
 
-VERSION='0.7.2'
+VERSION='0.7.3'
 PACKAGE='1'
 PLATFORM='win' + ''.join([ c for c in platform.architecture()[0] if c.isdigit() ])
 INSTALLER='diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
diff --git a/windows-installer/diffuse.iss b/windows-installer/diffuse.iss
@@ -5,7 +5,7 @@
 [Setup]
 AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.7.2
+AppVerName=Diffuse 0.7.3
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe
diff --git a/windows-installer/diffuse.new.iss b/windows-installer/diffuse.new.iss
@@ -4,7 +4,7 @@
 
 #define MyAppName "Diffuse Merge Tool"
 #define MyAppGroupName "Diffuse"
-#define MyAppVersion "0.7.2
+#define MyAppVersion "0.7.3"
 #define MyAppPublisher "Diffuse Team"
 #define MyAppURL "https://github.com/MightyCreak/diffuse/"
 #define MyAppExeName "diffuse.exe"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"`
`3`	`3`	`[`
`4`	`4`	`<!ENTITY app "Diffuse">`
`5`		`- <!ENTITY app-version "0.7.2">`
	`5`	`+ <!ENTITY app-version "0.7.3">`
`6`	`6`	`<!ENTITY app-year "2006-2021">`
`7`	`7`	`<!ENTITY manual-year "2009-2021">`
`8`	`8`	`]>`