From 5bc17ced68c0d79a77fcea572dfe458c7d1a9dce Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Thu, 21 Jul 2022 15:54:01 +1000 Subject: [PATCH 1/2] Test up to Python 3.10 --- .../workflows/continuous-integration-workflow.yml | 14 +++++++------- .gitignore | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index c4857ce878..5bcfbd4e7a 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -13,34 +13,32 @@ jobs: strategy: matrix: os: [ubuntu-20.04, windows-2019] + python-version: ["3.8", "3.9", "3.10"] fail-fast: false steps: - name: Checkout repository to $GITHUB_WORKSPACE uses: actions/checkout@v2 - name: Setup bootstrap Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: ${{ matrix.python-version }} - name: Install Poetry for Linux if: runner.os == 'Linux' run: | curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python - --version 1.1.5 echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Install Poetry for Windows if: runner.os == 'Windows' run: | (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | python - --version 1.1.5 echo "$env:APPDATA\Python\Scripts" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Install Python dependencies (Linux-only) if: runner.os == 'Linux' run: | sudo apt update sudo apt install libgirepository1.0-dev libcairo2-dev qemu-utils libvirt-dev - - name: Install Python dependencies run: make setup @@ -52,10 +50,12 @@ jobs: - name: Calculate code coverage run: make coverage + if: matrix.python-version == '3.8' - name: Run black/flake8/isort/mypy run: make check + if: matrix.python-version == '3.8' - name: Run ShellCheck - if: runner.os == 'Linux' - uses: ludeeus/action-shellcheck@0.5.0 + if: runner.os == 'Linux' && matrix.python-version == '3.8' + uses: ludeeus/action-shellcheck@0.5.0 \ No newline at end of file diff --git a/.gitignore b/.gitignore index cf6a29b6f9..2d428fbf35 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # python cache __pycache__ +*.py[co] # it's auto generated by poetry lisa.egg-info @@ -21,3 +22,5 @@ htmlcov # auto-generated test table & specifications /docs/run_test/test_summary.rst /docs/run_test/test_spec.rst + +[.][v]env/ \ No newline at end of file From 6c27c546fa496932ca77418b10318bab69e23c3a Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Thu, 21 Jul 2022 16:02:41 +1000 Subject: [PATCH 2/2] Update python-requires --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3c4e4ed466..ac8e7c40ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ paramiko = "^2.10.1" pluggy = "^0.13.1" pypiwin32 = {version = "^223", platform = "win32", optional=true} pytest-html = "^3.1.1" -python = "^3.8" +python = ">=3.8" python-dateutil = "^2.8.1" retry = "^0.9.2" spurplus = "^2.3.4"