From 0bcfc58c2279dac8c94293aa8c0ea7fa14d9ce31 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 14 Feb 2022 11:30:24 -0500
Subject: [PATCH] Various version fixes.

---
 .circleci/config.yml | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd26a5de8..9050c30b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,8 +44,6 @@ workflows:
       #    {}
 
       # Other assorted tasks and configurations
-      - "lint":
-          {}
       - "codechecks3":
           {}
       - "pyinstaller":
@@ -130,24 +128,6 @@ jobs:
             # Since this job is never scheduled this step is never run so the
             # actual value here is irrelevant.
 
-  lint:
-    docker:
-      - <<: *DOCKERHUB_AUTH
-        image: "cimg/python:3.9"
-
-    steps:
-      - "checkout"
-
-      - run:
-          name: "Install tox"
-          command: |
-            pip install --user tox
-
-      - run:
-          name: "Static-ish code checks"
-          command: |
-            ~/.local/bin/tox -e codechecks
-
   codechecks3:
     docker:
       - <<: *DOCKERHUB_AUTH
@@ -368,7 +348,8 @@ jobs:
       - <<: *DOCKERHUB_AUTH
         image: "tahoelafsci/ubuntu:20.04"
         user: "nobody"
-
+    environment:
+      TAHOE_LAFS_TOX_ENVIRONMENT: "py39"
 
   oraclelinux-8: &RHEL_DERIV
     docker:
@@ -376,7 +357,9 @@ jobs:
         image: "tahoelafsci/oraclelinux:8-py3.8"
         user: "nobody"
 
-    environment: *UTF_8_ENVIRONMENT
+    environment:
+      <<: *UTF_8_ENVIRONMENT
+      TAHOE_LAFS_TOX_ENVIRONMENT: "py38"
 
     # pip cannot install packages if the working directory is not readable.
     # We want to run a lot of steps as nobody instead of as root.