From b1d6de52f4bd0e6c5acfb20b561c4d5f0c0d638f Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 5 Feb 2024 11:36:34 -0600 Subject: [PATCH 1/2] Don't automerge packages whose names end with jl --- src/AutoMerge/guidelines.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/AutoMerge/guidelines.jl b/src/AutoMerge/guidelines.jl index d31cf115..3137acc4 100644 --- a/src/AutoMerge/guidelines.jl +++ b/src/AutoMerge/guidelines.jl @@ -244,7 +244,7 @@ function meets_name_ascii(pkg) end const guideline_julia_name_check = Guideline(; - info="Name does not include \"julia\" or start with \"Ju\".", + info="Name does not include \"julia\", start with \"Ju\", or end with \"jl\".", check=data -> meets_julia_name_check(data.pkg), ) @@ -254,6 +254,8 @@ function meets_julia_name_check(pkg) "Lowercase package name $(lowercase(pkg)) contains the string \"julia\"." elseif startswith(pkg, "Ju") return false, "Package name starts with \"Ju\"." + elseif endswith(lowercase(pkg), "jl") + return false, "Lowercase package name $(lowercase(pkg)) ends with \"jl\"." else return true, "" end From a428e0a9ac11ac6ced55b79b1f48cba9b5e0c649 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 5 Feb 2024 17:56:52 +0000 Subject: [PATCH 2/2] Add unit tests --- test/automerge-unit.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/automerge-unit.jl b/test/automerge-unit.jl index 3ea0c134..4667dacf 100644 --- a/test/automerge-unit.jl +++ b/test/automerge-unit.jl @@ -94,12 +94,14 @@ end @test !AutoMerge.meets_name_length("Flux")[1] @test !AutoMerge.meets_name_length("Flux")[1] end - @testset "Name does not include \"julia\" or start with \"Ju\"" begin + @testset "Name does not include \"julia\", start with \"Ju\", or end with \"jl\"" begin @test AutoMerge.meets_julia_name_check("Zygote")[1] @test AutoMerge.meets_julia_name_check("RegistryCI")[1] @test !AutoMerge.meets_julia_name_check("JuRegistryCI")[1] @test !AutoMerge.meets_julia_name_check("ZygoteJulia")[1] @test !AutoMerge.meets_julia_name_check("Zygotejulia")[1] + @test !AutoMerge.meets_julia_name_check("Sortingjl")[1] + @test !AutoMerge.meets_julia_name_check("BananasJL")[1] @test !AutoMerge.meets_julia_name_check("AbcJuLiA")[1] end @testset "Package name is ASCII" begin