Compare commits

...

3 Commits
v3.2 ... v3.2.2

Author SHA1 Message Date
a12b651d17 only publish python 3 2023-08-29 15:53:49 +02:00
62f078eaec github ubuntu doesnt support testing python2 anymore 2023-08-29 15:39:54 +02:00
fd1e7d5b33 fix 2023-08-29 15:33:49 +02:00
3 changed files with 10 additions and 36 deletions

View File

@ -20,20 +20,20 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Set up Python 2.x # - name: Set up Python 2.x
uses: actions/setup-python@v2 # uses: actions/setup-python@v2
with: # with:
python-version: '2.x' # python-version: '2.x'
- name: Install dependencies 3.x - name: Install dependencies 3.x
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip3 install setuptools wheel twine pip3 install setuptools wheel twine
- name: Install dependencies 2.x # - name: Install dependencies 2.x
run: | # run: |
python2 -m pip install --upgrade pip # python2 -m pip install --upgrade pip
pip2 install setuptools wheel twine # pip2 install setuptools wheel twine
- name: Build and publish - name: Build and publish
env: env:
@ -41,6 +41,6 @@ jobs:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: | run: |
python3 setup.py sdist bdist_wheel python3 setup.py sdist bdist_wheel
python2 setup.py sdist bdist_wheel # python2 setup.py sdist bdist_wheel
twine check dist/* twine check dist/*
twine upload dist/* twine upload dist/*

View File

@ -46,29 +46,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: coveralls --service=github || true run: coveralls --service=github || true
ubuntu20_python2:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3.5.0
- name: Set up Python 2.x
uses: actions/setup-python@v2
with:
python-version: '2.x'
- name: Prepare
run: sudo apt update && sudo apt install zfsutils-linux lzop pigz zstd gzip xz-utils lz4 mbuffer && sudo -H pip3 install coverage unittest2 mock==3.0.5 coveralls
- name: Regression test
run: sudo -E ./tests/run_tests
- name: Coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: coveralls --service=github || true

View File

@ -6,7 +6,6 @@ from .ZfsAuto import ZfsAuto
from .ZfsNode import ZfsNode from .ZfsNode import ZfsNode
import sys import sys
raise("need to be rewritten to use zfs-check")
# # try to be as unix compatible as possible, while still having decent performance # # try to be as unix compatible as possible, while still having decent performance
# def compare_trees_find(source_node, source_path, target_node, target_path): # def compare_trees_find(source_node, source_path, target_node, target_path):
@ -307,6 +306,7 @@ class ZfsAutoverify(ZfsAuto):
def cli(): def cli():
import sys import sys
raise(Exception("This program is incomplete, dont use it yet."))
signal(SIGPIPE, sigpipe_handler) signal(SIGPIPE, sigpipe_handler)
failed = ZfsAutoverify(sys.argv[1:], False).run() failed = ZfsAutoverify(sys.argv[1:], False).run()
sys.exit(min(failed,255)) sys.exit(min(failed,255))