From 305bd3008d3b5e09e3bdd6c52cf24b5d1248e150 Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Sun, 7 Feb 2021 14:48:19 +0100 Subject: [PATCH] fix python2 support --- .github/workflows/python-publish.yml | 22 ++++++++++++++++++---- .github/workflows/regression.yml | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 9c4e780..bb32e12 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -14,19 +14,33 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python + + - name: Set up Python 3.x uses: actions/setup-python@v2 with: python-version: '3.x' - - name: Install dependencies + + - name: Set up Python 2.x + uses: actions/setup-python@v2 + with: + python-version: '2.x' + + - name: Install dependencies 3.x run: | python -m pip install --upgrade pip pip install setuptools wheel twine + + - name: Install dependencies 2.x + run: | + python2 -m pip install --upgrade pip + pip2 install setuptools + - name: Build and publish env: TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | - python setup.py sdist bdist_wheel - python3 -m twine check dist/* + python3 setup.py sdist bdist_wheel + python2 setup.py sdist bdist_wheel + twine check dist/* twine upload dist/* diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 1bf85c8..5ca9b2e 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -50,3 +50,26 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: coveralls --service=github + + ubuntu18_python2: + runs-on: ubuntu-18.04 + + steps: + - name: Checkout + uses: actions/checkout@v2.3.4 + + - name: Set up Python 2.x + uses: actions/setup-python@v2 + with: + 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 + + - name: Regression test + run: sudo -E ./tests/run_tests + + - name: Coveralls + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: coveralls --service=github