From 65558c33dceffa04583d036ed41ce2637f672696 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 8 Sep 2023 20:46:51 +0300 Subject: [PATCH 1/4] Bump GitHub Actions Signed-off-by: Hugo van Kemenade --- .github/workflows/ci.yml | 11 ++++++----- .github/workflows/release.yml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfbcc701eb..94e1215e43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.x' - run: pip install -U ruff==0.0.284 - name: Run ruff run: ruff docker tests @@ -21,14 +21,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + allow-prereleases: true - name: Install dependencies run: | python3 -m pip install --upgrade pip @@ -46,7 +47,7 @@ jobs: variant: [ "integration-dind", "integration-dind-ssl", "integration-dind-ssh" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: make ${{ matrix.variant }} run: | docker logout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c6358a225..2e7a868d20 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: publish: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: From cd4bcea9c709cd9335592bcd7b8cab0fc83be91d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 8 Sep 2023 20:47:22 +0300 Subject: [PATCH 2/4] Add support for Python 3.12 Signed-off-by: Hugo van Kemenade --- setup.py | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 866aa23c8d..34c2c25228 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Software Development', 'Topic :: Utilities', 'License :: OSI Approved :: Apache Software License', diff --git a/tox.ini b/tox.ini index 2028dd3957..03467aea26 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310,311}, ruff +envlist = py{37,38,39,310,311,312}, ruff skipsdist=True [testenv] From c3ee8069242e90654bc8962fb7bf0894e2ca5038 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 8 Sep 2023 20:50:56 +0300 Subject: [PATCH 3/4] Add colour to CI logs for readability Signed-off-by: Hugo van Kemenade --- .github/workflows/ci.yml | 1 + .github/workflows/release.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94e1215e43..977199cebd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: [push, pull_request] env: DOCKER_BUILDKIT: '1' + FORCE_COLOR: 1 jobs: lint: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e7a868d20..b8b1f57d1f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,10 @@ on: type: boolean default: true +env: + DOCKER_BUILDKIT: '1' + FORCE_COLOR: 1 + jobs: publish: runs-on: ubuntu-22.04 From 711f72f51d3c947102912effdf002a9b55b4866b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 8 Sep 2023 21:10:37 +0300 Subject: [PATCH 4/4] Bump test requirements to support Python 3.12 Signed-off-by: Hugo van Kemenade --- test-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 951b3be9fc..031d0acf0a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ setuptools==65.5.1 -coverage==6.4.2 +coverage==7.2.7 ruff==0.0.284 -pytest==7.1.2 -pytest-cov==3.0.0 +pytest==7.4.2 +pytest-cov==4.1.0 pytest-timeout==2.1.0