Merge branch 'master' into pre-commit-ci-update-config

agronholm · May 9, 2024 · e3b909a · e3b909a
2 parents 4b90d73 + 5ee5bd3
commit e3b909a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     ports:
       - 127.0.0.1:1883:1883
 
-  redis:
-    image: redis
+  valkey:
+    image: valkey/valkey:7.2
     ports:
       - 127.0.0.1:6379:6379
diff --git a/src/apscheduler/triggers/cron/expressions.py b/src/apscheduler/triggers/cron/expressions.py
@@ -199,7 +199,7 @@ def __str__(self) -> str:
 class WeekdayPositionExpression(AllExpression):
     options: ClassVar[tuple[str, ...]] = ("1st", "2nd", "3rd", "4th", "5th", "last")
     value_re: ClassVar[Pattern] = re.compile(
-        r"(?P<option_name>%s) +(?P<weekday_name>(?:\d+|\w+))" % "|".join(options),
+        f"(?P<option_name>{'|'.join(options)}) +(?P<weekday_name>(?:\\d+|\\w+))",
         re.IGNORECASE,
     )