From e3bf6cc14cc86213d62322c94c3aeba355b0cdd2 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 12 Jun 2024 11:22:49 -0700
Subject: [PATCH 1/2] tox.ini, src/tox.ini: Reject broken filelock 3.15.0

---
 src/tox.ini | 1 +
 tox.ini     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/tox.ini b/src/tox.ini
index bd6e5da0546..c46e92b1ffa 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -30,6 +30,7 @@ requires =
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
     tox>=3.18
     tox<4.14.1
+    filelock!=3.15.0
 
 [sagedirect]
 # Base for tox environments that bypass the virtual environment set up by tox,
diff --git a/tox.ini b/tox.ini
index ad1dc38d11b..974dd884e6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -133,6 +133,7 @@ requires =
     # Because of https://github.com/tox-dev/tox/issues/3238, need <4.14.1
     tox>=4.2.7
     tox<4.14.1
+    filelock!=3.15.0
 
 skipsdist = true
 

From 0511699ced4b31506d97c1763adcfe3c05b92cbe Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 12 Jun 2024 11:47:46 -0700
Subject: [PATCH 2/2] .github/workflows/lint.yml: Install tox from ubuntu, as
 done in build.yml etc.

---
 .github/workflows/lint.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index dcc9ecb3cec..72f08bb6cd2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,14 +28,12 @@ jobs:
         GH_TOKEN: ${{ github.token }}
         SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-
-    - name: Install dependencies
+    - name: Install test prerequisites
       id: deps
-      run: pip install tox
+      # From docker.yml
+      run: |
+        sudo DEBIAN_FRONTEND=noninteractive apt-get update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
 
     - name: Code style check with ruff-minimal
       if: (success() || failure()) && steps.deps.outcome == 'success'