Require python 3.12; update CI and tests

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     name: Check code style
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
       - name: Install precommit
         run: pip install pre-commit
       - name: Check lint
@@ -26,8 +26,10 @@ jobs:
         include:
           - os: ubuntu-24.04
             python: "3.12"
+          - os: ubuntu-26.04
+            python: "3.14"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
       - name: Install packages
         run: sudo apt-get update && sudo apt-get install podman golang-github-containernetworking-plugin-dnsname sqlite3 jq
       - name: Install uv
@@ -53,9 +55,12 @@ jobs:
         run: podman exec testnode_0 journalctl
       - name: Wait
         run: uv run ceph-devstack wait teuthology
-      - name: Dump logs
+      - name: Dump dispatcher log
         if: success() || failure()
         run: podman logs -f teuthology
+      - name: Dump job log
+        if: success() || failure()
+        run: uv run ceph-devstack logs
       - name: Create archive
         if: success() || failure()
         run: |
@@ -67,7 +72,7 @@ jobs:
           sqlite3 /tmp/dev.db ".output stdout" ".mode json" "select * from jobs" | jq | tee /tmp/artifacts/jobs.json
       - name: Upload jobs.json
         if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: jobs
           path: /tmp/artifacts/jobs.json
@@ -77,7 +82,7 @@ jobs:
           tar -czf /tmp/artifacts/archive.tar ~/.local/share/ceph-devstack/archive/
       - name: Upload log archive
         if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: archive
           path: /tmp/artifacts/archive.tar

.github/workflows/tox.yml → .github/workflows/pytest.yml

@@ -1,4 +1,4 @@
-name: tox
+name: pytest
 
 on:
   pull_request:
@@ -8,26 +8,22 @@ on:
 
 jobs:
   test:
-    name: tox on python${{ matrix.python }} via ${{ matrix.os }}
+    name: pytest on python${{ matrix.python }} via ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
-            python: "3.10"
-          - os: ubuntu-22.04
-            python: "3.11"
           - os: ubuntu-24.04
             python: "3.12"
-          - os: ubuntu-24.04
-            python: "3.13"
+          - os: ubuntu-26.04
+            python: "3.14"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6.3.0
         with:
           python-version: ${{ matrix.python }}
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       - name: Run unit tests
-        run: uv run --extra test tox
+        run: uv run --all-extras pytest

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       - name: Install Python 3.13

pyproject.toml

@@ -12,7 +12,7 @@ classifiers = [
 ]
 keywords = ["podman", "ceph"]
 description = "Run a full teuthology lab on your laptop!"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = ["packaging", "pre-commit", "PyYAML", "tomlkit"]
 dynamic = ["version"]
 
@@ -45,3 +45,8 @@ requires = [
     "wheel",
     "setuptools-scm>=8",
 ]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"

tests/resources/ceph/test_env_vars.py

@@ -8,10 +8,12 @@
 
 class _TestContainerEnvVars:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         raise NotImplementedError
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         # return {}
         raise NotImplementedError
@@ -28,10 +30,12 @@ def test_env_vars(self, cls, env_vars):
 
 class TestPostgres(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Postgres
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "POSTGRES_USER": "root",
@@ -44,10 +48,12 @@ def env_vars(self):
 
 class TestPaddles(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Paddles
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "PADDLES_SERVER_HOST": "0.0.0.0",
@@ -56,10 +62,12 @@ def env_vars(self):
 
 class TestPulpito(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Pulpito
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "PULPITO_PADDLES_ADDRESS": "http://paddles:8080",
@@ -68,10 +76,12 @@ def env_vars(self):
 
 class TestTestNode(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.TestNode
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "CEPH_VOLUME_ALLOW_LOOP_DEVICES": "true",
@@ -80,10 +90,12 @@ def env_vars(self):
 
 class TestTeuthology(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Teuthology
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "SSH_PRIVKEY": "",
@@ -102,9 +114,11 @@ def env_vars(self):
 
 class TestBeanstalk(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Beanstalk
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {}

tests/resources/ceph/test_testnode.py

@@ -8,6 +8,7 @@
 
 class TestTestnode:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self) -> type[_TestNode]:
         return _TestNode
 

tests/resources/test_container.py

@@ -27,7 +27,7 @@ def cls(self):
         return Container
 
     @pytest.fixture(
-        scope="class", params=["build", "create", "start", "stop", "remove"]
+        scope="function", params=["build", "create", "start", "stop", "remove"]
     )
     def action(self, request):
         return request.param

tests/resources/test_misc.py

@@ -11,10 +11,11 @@
 
 class TestMiscResource(_TestPodmanResource):
     @pytest.fixture(scope="class", params=[Network, Secret])
+    @classmethod
     def cls(self, request):
         return request.param
 
-    @pytest.fixture(scope="class", params=["create", "exists", "remove"])
+    @pytest.fixture(scope="function", params=["create", "exists", "remove"])
     def action(self, request):
         return request.param
 

tests/resources/test_podmanresource.py

@@ -10,10 +10,11 @@
 
 class TestPodmanResource:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return PodmanResource
 
-    @pytest.fixture(scope="class", params=["create", "remove"])
+    @pytest.fixture(scope="function", params=["create", "remove"])
     def action(self, request):
         return request.param