From 809f2c9b9d458199af12d342596e3b923a442f57 Mon Sep 17 00:00:00 2001
From: Dima Tisnek <dima.tisnek@canonical.com>
Date: Tue, 26 Nov 2024 12:01:35 +0900
Subject: [PATCH] ci: bring the unit tests back from the dead

---
 .github/workflows/test.yaml | 58 ++++++++++++-------------------------
 Makefile                    | 16 ++++------
 tox.ini                     |  1 -
 3 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1aef854a..62aab734 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -31,16 +31,12 @@ jobs:
         python:
           - "3.10"
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Install dependencies
-        run: pip install tox
-      - name: Run validation tests
-        run: tox -e validate
+      - uses: astral-sh/setup-uv@v3.2.2
+      - run: uvx -p ${{ matrix.python }} tox -e validate
 
   unit-tests:
     name: Unit tests
@@ -56,16 +52,12 @@ jobs:
           - "3.12"
           - "3.13"
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Install dependencies
-        run: pip install tox
-      - name: Run unit tests
-        run: tox -e py3
+      - uses: astral-sh/setup-uv@v3.2.2
+      - run: uvx -p ${{ matrix.python }} tox -e unit
 
   integration:
     name: Integration
@@ -85,21 +77,14 @@ jobs:
           - "3.3/stable"
           - "3.4/stable"
           - "3.5/stable"
-          # A bunch of tests fail with juju.errors.JujuError: base: ubuntu@15.04/stable
-          # * test_subordinate_units
-          # * test_destroy_unit
-          # * test_ssh
-          # * ...
-          # - "3.6/beta"
+          - "3.6/candidate"
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Setup operator environment
-        uses: charmed-kubernetes/actions-operator@main
+      - uses: astral-sh/setup-uv@v3.2.2
+      - uses: charmed-kubernetes/actions-operator@main
         with:
           provider: lxd
           juju-channel: ${{ matrix.juju }}
@@ -131,9 +116,7 @@ jobs:
       #     # set model defaults
       #     juju model-defaults apt-http-proxy=$PROXY apt-https-proxy=$PROXY  juju-http-proxy=$PROXY juju-https-proxy=$PROXY  snap-http-proxy=$PROXY snap-https-proxy=$PROXY
       #     juju model-defaults
-      - name: Run integration
-        # Force one single concurrent test
-        run: tox -e integration
+      - run: uvx -p ${{ matrix.python }} tox -e integration
 
   integration-quarantine:
     name: Quarantined Integration Tests
@@ -151,16 +134,13 @@ jobs:
           - "3.4/stable"
           - "3.5/stable"
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - name: Setup operator environment
-        uses: charmed-kubernetes/actions-operator@main
+      - uses: astral-sh/setup-uv@v3.2.2
+      - uses: charmed-kubernetes/actions-operator@main
         with:
           provider: lxd
           juju-channel: ${{ matrix.juju }}
-      - name: Run integration
-        run: tox -e integration-quarantine
+      - run: uvx -p ${{ matrix.python }} tox -e integration-quarantine
diff --git a/Makefile b/Makefile
index 95c5fd58..ee2fdc12 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,7 @@ clean:
 	find . -name __pycache__ -type d -exec rm -r {} +
 	find . -name *.pyc -delete
 	rm -rf .tox
-	rm -rf docs/_build/
-
-.PHONY: .tox
-.tox:
-	tox -r --notest
+	rm -rf build dist docs/_build/
 
 .PHONY: client
 client:
@@ -21,19 +17,19 @@ client:
 	pre-commit run --files $(shell echo juju/client/_[cd]*.py)
 
 .PHONY: run-unit-tests
-run-unit-tests: .tox
-	tox -e py3
+run-unit-tests:
+	uvx tox -e unit
 
 .PHONY: run-integration-tests
-run-integration-tests: .tox
-	tox -e integration
+run-integration-tests:
+	uvx tox -e integration
 
 .PHONY: run-all-tests
 test: run-unit-tests run-integration-tests
 
 .PHONY: docs
 docs:
-	tox -e docs
+	uvx tox -e docs
 
 .PHONY: build-test
 build-test:
diff --git a/tox.ini b/tox.ini
index 1e6071c0..d284673b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py3,py38,py39,py310,py311,docs
 skipsdist=True
 
 [testenv]