Merge remote-tracking branch 'origin/main' into docker-flags

Author: joerick

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
   - id: black
 
 - repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.262
+  rev: v0.0.265
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]

bin/update_virtualenv.py

@@ -53,6 +53,10 @@ def git_ls_remote_versions(url) -> list[VersionTuple]:
             if version.is_prerelease:
                 log.info("Ignoring pre-release %r", str(version))
                 continue
+            # Do not upgrade past 20.22.0 to keep python 3.6 compat
+            if version >= Version("20.22.0"):
+                log.info("Ignoring %r which is not compatible with python 3.6", str(version))
+                continue
             versions.append(VersionTuple(version, version_string))
         except InvalidVersion:
             log.warning("Ignoring ref %r", ref)