diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 5ca9b2e..75ad535 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -17,7 +17,7 @@ jobs: - name: Prepare - run: lsmod && sudo apt update && sudo apt install zfsutils-linux && sudo -H pip3 install coverage unittest2 mock==3.0.5 coveralls + run: sudo apt update && sudo apt install zfsutils-linux && sudo -H pip3 install coverage unittest2 mock==3.0.5 coveralls - name: Regression test @@ -39,7 +39,7 @@ jobs: - name: Prepare - run: lsmod && sudo apt update && sudo apt install zfsutils-linux python3-setuptools && sudo -H pip3 install coverage unittest2 mock==3.0.5 coveralls + run: sudo apt update && sudo apt install zfsutils-linux python3-setuptools && sudo -H pip3 install coverage unittest2 mock==3.0.5 coveralls - name: Regression test @@ -64,7 +64,7 @@ jobs: python-version: '2.x' - name: Prepare - run: lsmod && sudo apt update && sudo apt install zfsutils-linux python-setuptools && sudo -H pip install coverage unittest2 mock==3.0.5 coveralls + run: sudo apt update && sudo apt install zfsutils-linux python-setuptools && sudo -H pip install coverage unittest2 mock==3.0.5 coveralls - name: Regression test run: sudo -E ./tests/run_tests diff --git a/zfs_autobackup/LogConsole.py b/zfs_autobackup/LogConsole.py index 3b51b66..a0abd6b 100644 --- a/zfs_autobackup/LogConsole.py +++ b/zfs_autobackup/LogConsole.py @@ -1,5 +1,9 @@ +# python 2 compatibility +from __future__ import print_function + import sys + colorama = False if sys.stdout.isatty(): try: @@ -39,4 +43,4 @@ class LogConsole: print(colorama.Fore.GREEN + "# " + txt + colorama.Style.RESET_ALL) else: print("# " + txt) - sys.stdout.flush() \ No newline at end of file + sys.stdout.flush() diff --git a/zfs_autobackup/__init__.py b/zfs_autobackup/__init__.py index f858dba..361b857 100755 --- a/zfs_autobackup/__init__.py +++ b/zfs_autobackup/__init__.py @@ -1,6 +1,4 @@ -#python 2 compatibility -from __future__ import print_function def cli():