From 9365e1859392f438d5a392b3bfb4b6ec68958db1 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Mon, 22 Nov 2021 21:11:39 -0500 Subject: [PATCH] Prepare for release v0.7.3 --- .editorconfig | 2 +- CHANGELOG.md | 7 ++++-- ...github.mightycreak.Diffuse.metainfo.xml.in | 25 +++++++++++++++++++ .../share/gnome/help/diffuse/C/diffuse.xml | 2 +- .../share/gnome/help/diffuse/cs/diffuse.xml | 2 +- .../share/gnome/help/diffuse/it/diffuse.xml | 2 +- .../share/gnome/help/diffuse/ru/diffuse.xml | 2 +- data/usr/share/omf/diffuse/diffuse-C.omf | 2 +- data/usr/share/omf/diffuse/diffuse-cs.omf | 2 +- data/usr/share/omf/diffuse/diffuse-it.omf | 2 +- data/usr/share/omf/diffuse/diffuse-ru.omf | 2 +- meson.build | 2 +- utils/book2manual.xsl | 4 +-- windows-installer/build.py | 2 +- windows-installer/diffuse.iss | 2 +- windows-installer/diffuse.new.iss | 2 +- 16 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.editorconfig b/.editorconfig index 21f293f..0cd24af 100644 --- 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 index 79a560a..6f23523 100644 --- 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 index a6aefd7..410e56e 100644 --- a/data/io.github.mightycreak.Diffuse.metainfo.xml.in +++ b/data/io.github.mightycreak.Diffuse.metainfo.xml.in @@ -21,6 +21,31 @@ + + +

+ Patch release that introduces linters (flake8 and mypy). +

+

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
    • +
+

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 (#120) +
    • +
+ +

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index db5ec23..07764ed 100644 --- a/data/usr/share/gnome/help/diffuse/C/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/C/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml index 097645f..1b1b781 100644 --- a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/data/usr/share/gnome/help/diffuse/it/diffuse.xml index ef432de..cb286d7 100644 --- a/data/usr/share/gnome/help/diffuse/it/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/it/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml index 7e65477..58a49c7 100644 --- a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/usr/share/omf/diffuse/diffuse-C.omf index eeaf50d..3dc3e44 100644 --- a/data/usr/share/omf/diffuse/diffuse-C.omf +++ b/data/usr/share/omf/diffuse/diffuse-C.omf @@ -5,7 +5,7 @@ Derrick Moser Diffuse User's Manual 2021-11-17 - + Diffuse is a graphical tool for merging and comparing text files. manual diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/usr/share/omf/diffuse/diffuse-cs.omf index ee43c4c..fed88d8 100644 --- a/data/usr/share/omf/diffuse/diffuse-cs.omf +++ b/data/usr/share/omf/diffuse/diffuse-cs.omf @@ -5,7 +5,7 @@ Derrick Moser Uživatelská příručka programu Diffuse 2021-11-17 - + Diffuse je grafický nástroj pro slučování a porovnávání textových souborů. manual diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/usr/share/omf/diffuse/diffuse-it.omf index 311d588..65a624a 100644 --- a/data/usr/share/omf/diffuse/diffuse-it.omf +++ b/data/usr/share/omf/diffuse/diffuse-it.omf @@ -5,7 +5,7 @@ Derrick Moser Manuale utente di Diffuse 2021-11-17 - + Diffuse è uno strumento grafico per l'unione e il confronto di file di testo. manual diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf index d00a3b7..c5f6082 100644 --- a/data/usr/share/omf/diffuse/diffuse-ru.omf +++ b/data/usr/share/omf/diffuse/diffuse-ru.omf @@ -5,7 +5,7 @@ Derrick Moser Руководство Пользователя Diffuse 2021-11-17 - + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/meson.build b/meson.build index 7f8704b..e75b195 100644 --- 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 index a6b30ad..d6d29fa 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,9 +1,9 @@ - + - + ]>