Merge https://github.com/jaraco/skeleton

# Conflicts: # ruff.toml
jaraco · Dec 26, 2023 · bf42021 · bf42021
2 parents 4c94afd + db0d581
commit bf42021
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,8 @@ on:
   merge_group:
   push:
     branches-ignore:
-    - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
+    # disabled for jaraco/skeleton#103
+    # - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
   pull_request:
 
 permissions:

diff --git a/ruff.toml b/ruff.toml
@@ -2,7 +2,7 @@
 extend-select = [
 	"I",  # sort imports
 ]
-extend-ignore = [
+ignore = [
 	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
 	"W191",
 	"E111",