From 6190399aef2f61f318bb5a0c78e5a1e9f8a7e335 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Tue, 15 Feb 2022 14:33:00 -0500
Subject: [PATCH] Just codechecks.

---
 .circleci/config.yml       | 6 +++---
 Makefile                   | 2 +-
 docs/release-checklist.rst | 2 +-
 tox.ini                    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1d73e89f..cf0c66aff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ workflows:
       #    {}
 
       # Other assorted tasks and configurations
-      - "codechecks3":
+      - "codechecks":
           {}
       - "pyinstaller":
           {}
@@ -128,7 +128,7 @@ jobs:
             # Since this job is never scheduled this step is never run so the
             # actual value here is irrelevant.
 
-  codechecks3:
+  codechecks:
     docker:
       - <<: *DOCKERHUB_AUTH
         image: "cimg/python:3.9"
@@ -144,7 +144,7 @@ jobs:
       - run:
           name: "Static-ish code checks"
           command: |
-            ~/.local/bin/tox -e codechecks3
+            ~/.local/bin/tox -e codechecks
 
   pyinstaller:
     docker:
diff --git a/Makefile b/Makefile
index fa8351535..5cbd863a3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ default:
 ## Run all tests and code reports
 test: .tox/create-venvs.log
 # Run codechecks first since it takes the least time to report issues early.
-	tox --develop -e codechecks3
+	tox --develop -e codechecks
 # Run all the test environments in parallel to reduce run-time
 	tox --develop -p auto -e 'py37'
 .PHONY: test-venv-coverage
diff --git a/docs/release-checklist.rst b/docs/release-checklist.rst
index 5697ab95f..aa5531b59 100644
--- a/docs/release-checklist.rst
+++ b/docs/release-checklist.rst
@@ -122,7 +122,7 @@ they will need to evaluate which contributors' signatures they trust.
 
   - these should all pass:
 
-    - tox -e py37,codechecks3,docs,integration
+    - tox -e py37,codechecks,docs,integration
 
   - these can fail (ideally they should not of course):
 
diff --git a/tox.ini b/tox.ini
index 3916b807c..525b5428c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@
 # the tox-gh-actions package.
 [gh-actions]
 python =
-    3.7: py37-coverage,typechecks,codechecks3
+    3.7: py37-coverage,typechecks,codechecks
     3.8: py38-coverage
     3.9: py39-coverage
     pypy-3.7: pypy3
@@ -16,7 +16,7 @@ python =
 twisted = 1
 
 [tox]
-envlist = typechecks,codechecks3,py{37,38,39}-{coverage},pypy27,pypy3,integration,integration3
+envlist = typechecks,codechecks,py{37,38,39}-{coverage},pypy27,pypy3,integration,integration3
 minversion = 2.4
 
 [testenv]
@@ -107,7 +107,7 @@ commands =
          coverage report
 
 
-[testenv:codechecks3]
+[testenv:codechecks]
 basepython = python3
 deps =
      # Newer versions of PyLint have buggy configuration