Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
updates:
- package-ecosystem: github-actions
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -13,7 +13,7 @@ updates:
timezone: "Europe/Berlin"
- package-ecosystem: pre-commit
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -23,7 +23,7 @@ updates:
timezone: "Europe/Berlin"
- package-ecosystem: pip
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -33,7 +33,7 @@ updates:
timezone: "Europe/Berlin"
- package-ecosystem: bundler
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand Down
8 changes: 4 additions & 4 deletions config/embedder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fragments:
updates:
- package-ecosystem: github-actions
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -71,7 +71,7 @@ fragments:
timezone: "Europe/Berlin"
- package-ecosystem: pre-commit
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -81,7 +81,7 @@ fragments:
timezone: "Europe/Berlin"
- package-ecosystem: pip
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand All @@ -91,7 +91,7 @@ fragments:
timezone: "Europe/Berlin"
- package-ecosystem: bundler
directory: /
labels: [dependencies]
labels: [deps]
commit-message:
prefix: chore
include: scope
Expand Down
2 changes: 1 addition & 1 deletion config/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ labels:
":triangular_flag_on_post:":
color: FFEFEF
description: Temporary fast-track flag
dependencies:
deps:
color: 0366d6
description: Pull requests that update a dependency file
"priority: P1":
Expand Down
24 changes: 12 additions & 12 deletions test/test_github_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ def test_loads_repository_config(self):
"labels",
},
)
self.assertIn("dependencies", checks["labels"]["required"])
self.assertIn("deps", checks["labels"]["required"])
self.assertIn("autorelease: pending", checks["labels"]["optional"])
self.assertEqual(
checks["labels"]["required"]["dependencies"]["description"],
checks["labels"]["required"]["deps"]["description"],
"Pull requests that update a dependency file",
)

Expand Down Expand Up @@ -73,7 +73,7 @@ def test_rejects_invalid_label_color(self):
with tempfile.NamedTemporaryFile(mode="w", suffix=".yml") as config:
config.write(
"config:\n hasWikiEnabled: false\n"
"labels:\n required:\n dependencies:\n"
"labels:\n required:\n deps:\n"
" color: blue\n description: Dependency updates\n"
)
config.flush()
Expand All @@ -85,7 +85,7 @@ def test_rejects_missing_label_description(self):
with tempfile.NamedTemporaryFile(mode="w", suffix=".yml") as config:
config.write(
"config:\n hasWikiEnabled: false\n"
"labels:\n required:\n dependencies:\n color: 0366d6\n"
"labels:\n required:\n deps:\n color: 0366d6\n"
)
config.flush()

Expand Down Expand Up @@ -150,7 +150,7 @@ def request(_repository, _fields):
def test_label_policy_accepts_required_and_present_optional_labels(self):
policy = {
"required": {
"dependencies": {"color": "0366d6", "description": "Dependency updates"}
"deps": {"color": "0366d6", "description": "Dependency updates"}
},
"optional": {
"autorelease: pending": {"color": "fbca04", "description": "Pending release"}
Expand All @@ -160,7 +160,7 @@ def test_label_policy_accepts_required_and_present_optional_labels(self):
policy,
"owner/repo",
request=lambda _repository: [
{"name": "dependencies", "color": "0366D6", "description": "Dependency updates"},
{"name": "deps", "color": "0366D6", "description": "Dependency updates"},
{"name": "autorelease: pending", "color": "fbca04", "description": "Pending release"},
],
)
Expand All @@ -170,7 +170,7 @@ def test_label_policy_accepts_required_and_present_optional_labels(self):
def test_label_policy_accepts_absent_optional_labels(self):
policy = {
"required": {
"dependencies": {"color": "0366d6", "description": "Dependency updates"}
"deps": {"color": "0366d6", "description": "Dependency updates"}
},
"optional": {
"autorelease: pending": {"color": "fbca04", "description": "Pending release"}
Expand All @@ -180,7 +180,7 @@ def test_label_policy_accepts_absent_optional_labels(self):
policy,
"owner/repo",
request=lambda _repository: [
{"name": "dependencies", "color": "0366d6", "description": "Dependency updates"}
{"name": "deps", "color": "0366d6", "description": "Dependency updates"}
],
)

Expand All @@ -189,7 +189,7 @@ def test_label_policy_accepts_absent_optional_labels(self):
def test_label_policy_reports_all_differences(self):
policy = {
"required": {
"dependencies": {"color": "0366d6", "description": "Dependency updates"},
"deps": {"color": "0366d6", "description": "Dependency updates"},
"size: S": {"color": "bfd4f2", "description": "Less than an hour"},
},
"optional": {
Expand All @@ -200,16 +200,16 @@ def test_label_policy_reports_all_differences(self):
policy,
"owner/repo",
request=lambda _repository: [
{"name": "dependencies", "color": "ffffff", "description": None},
{"name": "deps", "color": "ffffff", "description": None},
{"name": "bug", "color": "d73a4a", "description": "Something is broken"},
],
)

self.assertEqual(result.status, "failed")
self.assertIn("missing: size: S", result.message)
self.assertIn("unexpected: bug", result.message)
self.assertIn("dependencies expected #0366d6, got #ffffff", result.message)
self.assertIn('dependencies expected "Dependency updates", got ""', result.message)
self.assertIn("deps expected #0366d6, got #ffffff", result.message)
self.assertIn('deps expected "Dependency updates", got ""', result.message)

def test_skips_label_policy_without_requesting_labels(self):
results = CHECK_GITHUB_CONFIG.evaluate_checks(
Expand Down