ready to release on pip

This commit is contained in:
Edwin Eefting 2020-02-19 20:43:34 +01:00
parent 6c168ff867
commit bf1f0fc35b
5 changed files with 28 additions and 7 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
.vscode/settings.json .vscode/settings.json
token token
tokentest
dist/ dist/
build/ build/
zfs_autobackup.egg-info zfs_autobackup.egg-info

View File

@ -1,9 +1,10 @@
# ZFS autobackup v3 - TEST VERSION # ZFS autobackup
## New in v3 ## New in v3
* Complete rewrite, cleaner object oriented code. * Complete rewrite, cleaner object oriented code.
* Python 3 and 2 support. * Python 3 and 2 support.
* Installable via pip.
* Backwards compatible with your current backups and parameters. * Backwards compatible with your current backups and parameters.
* Progressive thinning (via a destroy schedule. default schedule should be fine for most people) * Progressive thinning (via a destroy schedule. default schedule should be fine for most people)
* Cleaner output, with optional color support (pip install colorama). * Cleaner output, with optional color support (pip install colorama).
@ -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 ```console
[root@pve ~]# zfs_autobackup --ssh-target backup.server.com offsite1 backup/pve --progress --verbose --resume [root@pve ~]# zfs_autobackup --ssh-target backup.server.com offsite1 backup/pve --progress --verbose --resume

View File

@ -27,7 +27,7 @@ try:
except ImportError: except ImportError:
use_color=False use_color=False
VERSION="3.0-beta6" VERSION="3.0-rc1"
class Log: class Log:
@ -912,7 +912,7 @@ class ZfsDataset():
if self.zfs_node.readonly: if self.zfs_node.readonly:
self.force_exists=True 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: if not self.exists:
raise(Exception("Target doesnt exist after transfer, something went wrong.")) raise(Exception("Target doesnt exist after transfer, something went wrong."))

View File

@ -10,6 +10,8 @@ python3 setup.py sdist bdist_wheel
gnome-keyring-daemon gnome-keyring-daemon
source token 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/*

17
releasetest Executable file
View File

@ -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