From 126db64ccd473d097046f0f202b21be1d3fd7441 Mon Sep 17 00:00:00 2001 From: Jaime Freire de Souza Date: Mon, 18 Dec 2023 10:37:34 -0300 Subject: [PATCH] Drop support for Ubuntu Focal (#18) * Drop support for Ubuntu Focal * bugfix: Bump pytest-operator to 0.31.1 Updating integration test dependency resolves error with pytest async plugin. Signed-off-by: Jason C. Nucciarone --------- Signed-off-by: Jason C. Nucciarone Co-authored-by: Jason C. Nucciarone --- .github/workflows/ci.yaml | 3 +-- charmcraft.yaml | 3 --- tox.ini | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98a3583..b1c606d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,8 +56,7 @@ jobs: strategy: fail-fast: true matrix: - bases: - - ubuntu@20.04 + bases: - ubuntu@22.04 name: Integration tests (LXD) | ${{ matrix.bases }} runs-on: ubuntu-latest diff --git a/charmcraft.yaml b/charmcraft.yaml index 85c5fd1..6a6f7d1 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -10,9 +10,6 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64] - - name: ubuntu - channel: "20.04" - architectures: [amd64] parts: charm: diff --git a/tox.ini b/tox.ini index 072934d..1b89fbc 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,7 @@ description = Run integration tests deps = juju pytest==7.2.0 - pytest-operator==0.26.0 + pytest-operator==0.31.1 pytest-order==1.1.0 tenacity==8.2.2 -r{toxinidir}/requirements.txt