diff --git a/.gitignore b/.gitignore index a6de137..e4e22d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .vscode/settings.json token +tokentest dist/ build/ zfs_autobackup.egg-info diff --git a/README.md b/README.md index 629f48b..45cb81b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ -# ZFS autobackup v3 - TEST VERSION +# ZFS autobackup ## New in v3 * Complete rewrite, cleaner object oriented code. * Python 3 and 2 support. +* Installable via pip. * Backwards compatible with your current backups and parameters. * Progressive thinning (via a destroy schedule. default schedule should be fine for most people) * Cleaner output, with optional color support (pip install colorama). @@ -55,7 +56,7 @@ Use pip or easy_install to install: ``` -Its also possible to just download zfs_autobackup and run it directly. +Its also possible to just download zfs_autobackup and run it directly. ## Usage @@ -241,7 +242,7 @@ First install the ssh-key on the server that you specify with --ssh-source or -- ... ``` -#### Method 2: Run the script on the server and push the data to the backup server specified by --ssh-target: +#### Method 2: Run the script on the server and push the data to the backup server specified by --ssh-target ```console [root@pve ~]# zfs_autobackup --ssh-target backup.server.com offsite1 backup/pve --progress --verbose --resume diff --git a/bin/zfs_autobackup b/bin/zfs_autobackup index 4807870..7c72ac6 100755 --- a/bin/zfs_autobackup +++ b/bin/zfs_autobackup @@ -27,7 +27,7 @@ try: except ImportError: use_color=False -VERSION="3.0-beta6" +VERSION="3.0-rc1" class Log: @@ -912,7 +912,7 @@ class ZfsDataset(): if self.zfs_node.readonly: self.force_exists=True - #check if transfer was really ok (exit codes have been wrong before and can be ignore by some parameters) + #check if transfer was really ok (exit codes have been wrong before due to bugs in zfs-utils and can be ignored by some parameters) if not self.exists: raise(Exception("Target doesnt exist after transfer, something went wrong.")) diff --git a/release b/release index ca052a2..427d3ea 100755 --- a/release +++ b/release @@ -10,6 +10,8 @@ python3 setup.py sdist bdist_wheel gnome-keyring-daemon source token -python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* -# python3 -m twine upload dist/* + + +python3 -m twine check dist/* +python3 -m twine upload dist/* diff --git a/releasetest b/releasetest new file mode 100755 index 0000000..e692f55 --- /dev/null +++ b/releasetest @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e + + +rm -rf dist +python3 setup.py sdist bdist_wheel +# python2 setup.py sdist bdist_wheel + + +gnome-keyring-daemon +source tokentest + + +python3 -m twine check dist/* +python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* --verbose +