feat: add root-dir argument in restore action

MatteoGuadrini · Jan 9, 2025 · 395c413 · 395c413
1 parent 5f7533b
commit 395c413
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 227 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,13 @@
 # Release notes
 
+## 1.14.0
+Jan 09, 2025
+* Add **--root-dir** argument in _restore_ action
+* Add warning on exit command if rsync error is `23` or `24`
+* Add more check for ssh connection
+* Unlink _last_backup_ folder if retention is applied
+* Fix _system_ key into **compose_restore_src_dst** function
+
 ## 1.13.0
 Jan 02, 2025
 * Fix return of **get_last_backup** function for incremental and differential backup, refs #7

diff --git a/README.md b/README.md
@@ -86,7 +86,6 @@ sudo python3 setup.py install -f # -f is for upgrade
 # or
 sudo pip install . --upgrade
 bb --help
-man bb
 ```
 
 ### Backup machine
@@ -181,9 +180,6 @@ A backup or restore is performed without any iteration responsibility on the par
 The performances are not altered.
 While all the operations of Butterfly Backup are carried out, the impacted machine can continuously work with _peace of mind_.
 
-## Follow the project
-See the new features in development through this [link](https://tree.taiga.io/project/matteoguadrini-butterfly-backup/kanban).
-
 ## Open source
 Butterfly Backup is a open source project. Any contribute, It's welcome.
 
@@ -202,3 +198,16 @@ They were born in 1990 to respond to the appeal of patients suffering from rare
 Come today, we are organized to dare to listen to them and answers, every day of the year.
 
 [Adopt the future](https://www.ioadottoilfuturo.it/)
+
+## Acknowledgments
+
+Thanks to Mark Lutz for writing the _Learning Python_ and _Programming Python_ books that make up my python foundation.
+
+Thanks to Kenneth Reitz and Tanya Schlusser for writing the _The Hitchhiker’s Guide to Python_ books.
+
+Thanks to Dane Hillard for writing the _Practices of the Python Pro_ books.
+
+Special thanks go to my wife, who understood the hours of absence for this development. 
+Thanks to my children, for the daily inspiration they give me and to make me realize, that life must be simple.
+
+Thanks Python!
diff --git a/bb.1 b/bb.1
diff --git a/bb.py b/bb.py
@@ -64,7 +64,7 @@
 import utility
 
 # region Global Variables
-VERSION = "1.13.0"
+VERSION = "1.14.0"
 
 
 # endregion

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,11 +7,24 @@ py-modules = ["bb", "utility"]
 
 [project]
 name = "Butterfly-Backup"
-version = "1.12.0"
+version = "1.14.0"
 readme = "README.md"
-license = {text = "GNU General Public License v3.0"}
-keywords = ['backup', 'archive', 'restore', 'rsync', 'catalog', 'list',
-            'config', 'export', 'mirror', 'incremental', 'differential', 'clone', 'copy']
+license = { text = "GNU General Public License v3.0" }
+keywords = [
+    'backup',
+    'archive',
+    'restore',
+    'rsync',
+    'catalog',
+    'list',
+    'config',
+    'export',
+    'mirror',
+    'incremental',
+    'differential',
+    'clone',
+    'copy',
+]
 authors = [{ name = "Matteo Guadrini", email = "matteo.guadrini@hotmail.it" }]
 maintainers = [
     { name = "Matteo Guadrini", email = "matteo.guadrini@hotmail.it" },
@@ -24,7 +37,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: POSIX :: Linux",
 ]
-dependencies = ["pansi==2020.7.3", "fabric"]
+dependencies = ["pansi==2020.7.3", "fabric==3.2.2"]
 
 [project.scripts]
 bb = "bb:main"

diff --git a/setup.py b/setup.py
@@ -29,17 +29,30 @@
 setup(
     name="Butterfly-Backup",
     py_modules=["bb", "utility"],
-    version="1.12.0",
+    version="1.14.0",
     url="https://matteoguadrini.github.io/Butterfly-Backup/",
     project_urls={
         "Documentation": "https://butterfly-backup.readthedocs.io/en/latest/",
         "GitHub Project": "https://github.com/MatteoGuadrini/Butterfly-Backup",
         "Issue Tracker": "https://github.com/MatteoGuadrini/Butterfly-Backup/issues",
     },
-    install_requires=["pansi==2020.7.3", "fabric"],
+    install_requires=["pansi==2020.7.3", "fabric==3.2.2"],
     license="GNU General Public License v3.0",
-    keywords = ['backup', 'archive', 'restore', 'rsync', 'catalog', 'list',
-            'config', 'export', 'mirror', 'incremental', 'differential', 'clone', 'copy'],
+    keywords=[
+        "backup",
+        "archive",
+        "restore",
+        "rsync",
+        "catalog",
+        "list",
+        "config",
+        "export",
+        "mirror",
+        "incremental",
+        "differential",
+        "clone",
+        "copy",
+    ],
     author="Matteo Guadrini",
     author_email="matteo.guadrini@hotmail.it",
     maintainer="Matteo Guadrini",
@@ -53,6 +66,5 @@
         "Operating System :: POSIX :: Linux",
     ],
     entry_points={"console_scripts": ["bb = bb:main"]},
-    data_files=[("/usr/share/man/man1", ["bb.1"])],
     python_requires=">=3.8",
 )