From 2b901aee1a836d0fb661c3eb99037912f0cc771c Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Tue, 23 Jul 2024 08:55:52 +0200 Subject: [PATCH 1/6] changelog --- CHANGES | 46 ++++++++++----------------- common/doc-dev/BiT_release_process.md | 5 +-- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/CHANGES b/CHANGES index 972d016f4..4fdd2e0b4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,49 +1,35 @@ Back In Time -Version 1.4.4-dev (development of upcoming release) -* Fix: Global flock fallback to single-user mode if insufficient permissions (#1743, #1751) -* Chore!: Remove "debian" folder (#1548) +Version 1.5.0 (2024-07-23) +* Dependency: Migration to PyQt6 * Breaking Change: EncFS deprecation warning (#1735, #1734) -* Fix: Fix Qt segmentation fault with uninstall ExtraMouseButtonEventFilter when closing main window (#1095) -* Feature: Warn if Cron is not running (#1747) -* Build: Enable PyLint rules (#1755) - * C0303 (trailing-whitespaces) - * C0305 (trailing-newlines) - * C0325 (superfluous-parens) - * C0410 (multiple-imports) - * E0100 (init-is-generator) - * E0101 (return-in-init) - * E0102 (function-redefined) - * E0103 (not-in-loop) - * E0106 (return-arg-in-generator) - * E0213 (no-self-argument) - * E0401 (import-error) - * E602 (undefined-variable) - * W0311 (bad-indentation) - * W1515 (forgotten-debug-statement). -* Fix: Names of weekdays and months translated correct (#1729) -* Fix: Global flock for multiple users (#1122, #1676) -* Fix bug: "Backup folders" list does reflect the selected snapshot (#1585) (@rafaelhdr Rafael Hurpia da Rocha) * Breaking Change: GUI started with --debug does no longer add --debug to the crontab for scheduled profiles. Use the new "enable logging for debug messages" in the 'Schedule' section of the 'Manage profiles' GUI instead. +* Feature: Warn if Cron is not running (#1747) * Feature: Profile and GUI allow to activate debug output for scheduled jobs by adding '--debug' to crontab entry (#1616, contributed by @stcksmsh Kosta Vukicevic) -* Removed: Field "filesystem_mount" and "snapshot_version" in "info" file (#1684) * Feature: Support SSH proxy (jump) host (#1688) (@cgrinham, Christie Grinham) -* Removed: Context menu in LogViewDialog (#1578) -* Refactor: Replace Config.user() with getpass.getuser() (#1694) +* Feature: Support rsync '--one-file-system' in Expert Options (#1598) +* Feature: "*-dev" version strings contain last commit hash (#1637) +* Fix: Global flock fallback to single-user mode if insufficient permissions (#1743, #1751) +* Fix: Fix Qt segmentation fault with uninstall ExtraMouseButtonEventFilter when closing main window (#1095) +* Fix: Names of weekdays and months translated correct (#1729) +* Fix: Global flock for multiple users (#1122, #1676) +* Fix bug: "Backup folders" list does reflect the selected snapshot (#1585) (@rafaelhdr Rafael Hurpia da Rocha) * Fix: Validation of diff command settings in compare snapshots dialog (#1662) (@stcksmsh Kosta Vukicevic) * Fix bug: Open symlinked folders in file view (#1476) * Fix bug: Respect dark mode using color roles (#1601) * Fix: "Highly recommended" exclusion pattern in "Manage Profile" dialog's "Exclude" tab show missing only (#1620) -* Dependency: Migration to PyQt6 +* Fix bug: `make install` ignored $(DEST) in file migration part (#1630) +* Removed: Context menu in LogViewDialog (#1578) +* Removed: Field "filesystem_mount" and "snapshot_version" in "info" file (#1684) +* Refactor: Replace Config.user() with getpass.getuser() (#1694) +* Chore!: Remove "debian" folder (#1548) +* Build: Enable sevaral PyLint rules (#1755, #1766) * Build: Add AppStream meta data (#1642) * Build: PyLint unit test is skipped if PyLint isn't installed, but will always run on TravisCI (#1634) -* Feature: Support rsync '--one-file-system' in Expert Options (#1598) -* Feature: "*-dev" version strings contain last commit hash (#1637) * Build: Git commit hash is presevered while "make install" (#1637) * Build: Fix bash-completion symlink creation while installing & adding --diagnostics (#1615) * Build: TravisCI use PyQt (except arch "ppc64le") -* Fix bug: `make install` ignored $(DEST) in file migration part (#1630) Version 1.4.3 (2024-01-30) * Feature: Exclude 'SingletonLock' and 'SingletonCookie' (Discord) and 'lock' (Mozilla Firefox) files by default (part of #1555) diff --git a/common/doc-dev/BiT_release_process.md b/common/doc-dev/BiT_release_process.md index abec30aab..963d074cc 100644 --- a/common/doc-dev/BiT_release_process.md +++ b/common/doc-dev/BiT_release_process.md @@ -1,5 +1,4 @@ -# How to prepare and publish a new BiT release - +# How to prepare and publish a new BIT release ## Overview @@ -9,8 +8,6 @@ using a "feature" branch and sending a pull request asking for a review. - Source branch: `dev` - Target branch for the pull request: `dev` - - ## Preconditions for a new release - Developers agreed on the new version number. From d209d428e5bc36620ac2e72b97fd022172a9aa4e Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Tue, 23 Jul 2024 09:02:35 +0200 Subject: [PATCH 2/6] version and date --- README.md | 10 +++++----- VERSION | 2 +- common/doc-dev/BiT_release_process.md | 15 +-------------- common/man/C/backintime-askpass.1 | 2 +- common/man/C/backintime-config.1 | 2 +- common/man/C/backintime.1 | 2 +- common/version.py | 2 +- qt/man/C/backintime-qt.1 | 2 +- 8 files changed, 12 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 26fa1a35c..5a3fd7e15 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ installation options provided and maintained by third parties. In the latest stable release: - [File permissions handling and therefore possible non-differential backups](#file-permissions-handling-and-therefore-possible-non-differential-backups) -- [`qt5_probing.py` may hang with high CPU usage when running BiT as `root` via `cron`](#qt5_probingpy-may-hang-with-high-cpu-usage-when-running-bit-as-root-via-cron) +- [`qt_probing.py` may hang with high CPU usage when running BiT as `root` via `cron`](#qt_probingpy-may-hang-with-high-cpu-usage-when-running-bit-as-root-via-cron) In older releases: - Error: "module 'qttools' has no attribute 'initate_translator'" with EncFS when prompting the user for a password ([#1553](https://github.com/bit-team/backintime/issues/1553)) @@ -112,14 +112,14 @@ to add `--no-perms --no-group --no-owner` to it. Note that the exact file permissions can still be found in `fileinfo.bz2` and are also considered when restoring files. -### `qt5_probing.py` may hang with high CPU usage when running BiT as `root` via `cron` +### `qt_probing.py` may hang with high CPU usage when running BiT as `root` via `cron` See the related issue [#1592](https://github.com/bit-team/backintime/issues/1592). The only reliable work-around is to delete (or move into another folder) -the file `/usr/share/backintime/common/qt5_probing.py`: +the file `/usr/share/backintime/common/qt_probing.py`: -`mv /usr/share/backintime/common/qt5_probing.py /usr/share/backintime/` +`mv /usr/share/backintime/common/qt_probing.py /usr/share/backintime/` Renaming does *not* work! @@ -195,4 +195,4 @@ _Back In Time_. In that case you may not see any problems. See [CONTRIBUTING](CONTRIBUTING.md) file for an overview about the projects workflow and strategy. -May 2024 +July 2024 diff --git a/VERSION b/VERSION index 2847639f7..bc80560fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.4-dev +1.5.0 diff --git a/common/doc-dev/BiT_release_process.md b/common/doc-dev/BiT_release_process.md index 963d074cc..adef67b83 100644 --- a/common/doc-dev/BiT_release_process.md +++ b/common/doc-dev/BiT_release_process.md @@ -110,11 +110,8 @@ When the PR is merged: using the version number from the `VERSION` file (so you do not forget to update one file ;-). - - BiT CLI config in `common/config.py` - - Sphinx config in `common/doc-dev/conf.py` + - BiT CLI config in `common/version.py` - man pages in `common/man/C/backintime*.1` and `qt/man/C/backintime*.1` - - changelog to build a debian package in `debian/changelog` - (this will be deprecated once we give up or separate the packaging for distros) - Check that the version numbers have been update by opening some of the above files. @@ -125,15 +122,6 @@ When the PR is merged: .TH backintime-config 1 "Aug 2023" "version 1.4.0" "USER COMMANDS" ``` -- Optional: Search for all "copyright" strings in the code to update the year and add missing major contributors - - Eg.: - - common/config.py - - There is also script `updatecopyright.sh` in the project's root folder - which updates the copyright dates in all files but this script - needs an overhaul to be able to insert new contributors too... - - Update the `AUTHORS` file in the project's root folder - Should be done during development normally @@ -142,7 +130,6 @@ When the PR is merged: - Review and update the `README.md` in your release candidate branch - - Copyright: Names and year - Update the **Known Problems and Workarounds** section: - Move fixed major known problems from the "Known Problems and Workarounds" section diff --git a/common/man/C/backintime-askpass.1 b/common/man/C/backintime-askpass.1 index 22a85b40f..ffc5e8db9 100644 --- a/common/man/C/backintime-askpass.1 +++ b/common/man/C/backintime-askpass.1 @@ -1,4 +1,4 @@ -.TH backintime-askpass 1 "Jan 2024" "version 1.4.4-dev" "USER COMMANDS" +.TH backintime-askpass 1 "July 2024" "version 1.5.0" "USER COMMANDS" .SH NAME backintime-askpass \- a simple backup tool for Linux. .PP diff --git a/common/man/C/backintime-config.1 b/common/man/C/backintime-config.1 index 177fbef99..b3b6889e2 100644 --- a/common/man/C/backintime-config.1 +++ b/common/man/C/backintime-config.1 @@ -1,4 +1,4 @@ -.TH backintime-config 1 "Feb 2024" "version 1.4.4-dev" "USER COMMANDS" +.TH backintime-config 1 "July 2024" "version 1.5.0" "USER COMMANDS" .SH NAME config \- BackInTime configuration files. .SH SYNOPSIS diff --git a/common/man/C/backintime.1 b/common/man/C/backintime.1 index 78851e16f..988c41532 100644 --- a/common/man/C/backintime.1 +++ b/common/man/C/backintime.1 @@ -1,4 +1,4 @@ -.TH backintime 1 "Jan 2024" "version 1.4.4-dev" "USER COMMANDS" +.TH backintime 1 "July 2024" "version 1.5.0" "USER COMMANDS" .SH NAME backintime \- a simple backup tool for Linux. .PP diff --git a/common/version.py b/common/version.py index 28c1aa06d..9bf13525b 100644 --- a/common/version.py +++ b/common/version.py @@ -5,4 +5,4 @@ """ # Version string regularyly used by the application and presented to users. -__version__ = '1.4.4-dev' +__version__ = '1.5.0' diff --git a/qt/man/C/backintime-qt.1 b/qt/man/C/backintime-qt.1 index d17b0f38d..2eb887bb5 100644 --- a/qt/man/C/backintime-qt.1 +++ b/qt/man/C/backintime-qt.1 @@ -1,4 +1,4 @@ -.TH backintime-qt 1 "Oct 2023" "version 1.4.4-dev" "USER COMMANDS" +.TH backintime-qt 1 "July 2024" "version 1.5.0" "USER COMMANDS" .SH NAME backintime-qt \- a simple backup tool. .SH SYNOPSIS From c147ec09a190bfa6fc45518bb17c8a45569ff2fd Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Tue, 23 Jul 2024 09:03:19 +0200 Subject: [PATCH 3/6] Codespell --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 4fdd2e0b4..51b99a079 100644 --- a/CHANGES +++ b/CHANGES @@ -24,7 +24,7 @@ Version 1.5.0 (2024-07-23) * Removed: Field "filesystem_mount" and "snapshot_version" in "info" file (#1684) * Refactor: Replace Config.user() with getpass.getuser() (#1694) * Chore!: Remove "debian" folder (#1548) -* Build: Enable sevaral PyLint rules (#1755, #1766) +* Build: Enable several PyLint rules (#1755, #1766) * Build: Add AppStream meta data (#1642) * Build: PyLint unit test is skipped if PyLint isn't installed, but will always run on TravisCI (#1634) * Build: Git commit hash is presevered while "make install" (#1637) From 5dfd488068c9e3283381812d42cb88b396503932 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Tue, 23 Jul 2024 17:14:47 +0200 Subject: [PATCH 4/6] fix encfs whitepaper url --- common/bitbase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/bitbase.py b/common/bitbase.py index ca988cf88..9a209182d 100644 --- a/common/bitbase.py +++ b/common/bitbase.py @@ -9,4 +9,4 @@ # See issue #1734 and #1735 URL_ENCRYPT_TRANSITION = 'https://github.com/bit-team/backintime' \ - '/doc/ENCRYPT_TRANSITION.md' + '/blob/-/doc/ENCRYPT_TRANSITION.md' From 044ad056481938b8efe8e5393f6ec12cb002fcd2 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Thu, 25 Jul 2024 22:28:23 +0200 Subject: [PATCH 5/6] mod release date --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 51b99a079..9b307beb7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ Back In Time -Version 1.5.0 (2024-07-23) +Version 1.5.0 (2024-07-26) * Dependency: Migration to PyQt6 * Breaking Change: EncFS deprecation warning (#1735, #1734) * Breaking Change: GUI started with --debug does no longer add --debug to the crontab for scheduled profiles. From 8c033e2760d291ff8513d9391605272af20323dd Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Fri, 26 Jul 2024 10:28:07 +0200 Subject: [PATCH 6/6] Fabien [skip ci] --- TRANSLATIONS | 1 - 1 file changed, 1 deletion(-) diff --git a/TRANSLATIONS b/TRANSLATIONS index 36a148db8..7fcc983cd 100644 --- a/TRANSLATIONS +++ b/TRANSLATIONS @@ -15,7 +15,6 @@ Finnish [fi]: - Ellen Rönnholm French [fr]: - Michel Corps (@jej) - - Fabien Orjollet Indonesian [id]: Andika Triwidada Japanese [ja]: - Ayako Buhtz