From 3d5d9b48b785de521d078a0b3f7fdd8b2ecc761d Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Thu, 12 Oct 2023 14:54:53 +0600 Subject: [PATCH 1/4] added Asif Saif Uddin as author --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 76a8007..f19a811 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,4 @@ Ask Solem +Asif Saif Uddin Ionel Cristian Mărieș Fahad Siddiqui From 72755ba42a364f405ba783db143d37b4294dfd97 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Thu, 12 Oct 2023 15:00:16 +0600 Subject: [PATCH 2/4] new python on tox and CI setup --- .github/workflows/ci.yml | 4 ++-- tox.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a8641b..b030045 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install dependencies diff --git a/tox.ini b/tox.ini index 90a2a18..c729e2d 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = 3.8 3.9 3.10 + 3.12 pypy3 flake8 apicheck From 5ca73fefa96022c2edd67e5ae8dab1ddc60fd9ed Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Thu, 12 Oct 2023 15:00:43 +0600 Subject: [PATCH 3/4] new python on tox and CI setup --- .github/workflows/ci.yml | 50 +++++++++++++++------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b030045..8711b63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,36 +1,22 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: Python application - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - +name: CI +on: [pull_request, push] jobs: - build: + #################### Unittests #################### + unittest: runs-on: ubuntu-latest - + strategy: + matrix: + python-version: [3.8,3.9,"3.10","3.12"] steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flake8 pytest tox - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Lint with flake8 - run: | - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with tox - run: | - tox + - name: Check out code from GitHub + uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + id: python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: pip install --upgrade pip setuptools wheel tox + - name: Run unittest + run: tox -v -e ${{ matrix.python-version }}-unit -- -v From 73d92751fc1b1852ed2d4bdda966d2fb4771113d Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Thu, 12 Oct 2023 16:56:07 +0600 Subject: [PATCH 4/4] re structure tox config --- tox.ini | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index c729e2d..c5e5937 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,11 @@ [tox] envlist = - 3.7 - 3.8 - 3.9 - 3.10 - 3.12 - pypy3 + {pypy3,3.12,3.8,3.9,3.10}-unit flake8 apicheck pydocstyle + [testenv] deps= -r{toxinidir}/requirements/test.txt @@ -19,7 +15,15 @@ deps= flake8,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt sitepackages = False recreate = False -commands = py.test -xv --cov=vine --cov-report=xml --no-cov-on-fail +commands = py.test -xv --cov=vine --cov-report=xml --no-cov-on-fail t/unit {posargs} + +basepython = + flake8,apicheck,linkcheck,pydocstyle: python3.10 + pypy3: pypy3.10 + 3.8: python3.8 + 3.9: python3.9 + 3.10: python3.10 + 3.12: python3.12 [testenv:apicheck] commands =