Merge #411

411: Use the `RegistryTools.package_relpath` function r=DilumAluthge a=DilumAluthge



Co-authored-by: Dilum Aluthge <[email protected]>

Author: bors[bot]

Project.toml

@@ -1,7 +1,7 @@
 name = "RegistryCI"
 uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32"
 authors = ["Dilum Aluthge <[email protected]>", "Fredrik Ekre <[email protected]>", "contributors"]
-version = "7.1.3"
+version = "7.1.4"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -29,11 +29,11 @@ GitHub = "5.2"
 HTTP = "0.8, 0.9.1"
 JSON = "0.19, 0.20, 0.21"
 LicenseCheck = "0.2"
-RegistryTools = "1.2"
+RegistryTools = "1.5.5"
 SimpleMock = "1"
 StringDistances = "0.9, 0.10"
-Tar = "1"
 TOML = "1"
+Tar = "1"
 TimeZones = "1"
 VisualStringDistances = "0.1"
 julia = "1.3"

src/AutoMerge/package_path_in_registry.jl

@@ -18,11 +18,10 @@ function get_package_relpath_in_registry(; package_name::String,
 end
 
 # What the relative path of the package *should* be, in theory.
-# This function should only be used in the
+# This function should ONLY be used in the
 # "PR only changes a subset of the allowed files" check.
 # For all other uses, you shoud use the `get_package_relpath_in_registry`
 # function instead.
 function _get_package_relpath_per_name_scheme(; package_name::String)
-    first_letter_str = uppercase(package_name[1:1])
-    return joinpath(first_letter_str, package_name)
+    return RegistryTools.package_relpath(package_name)
 end

test/automerge-unit.jl

@@ -415,8 +415,11 @@ end
         # and add some packages to inspect.
         tmp_path = mktempdir()
         has_osi_license_in_depot(pkg) = AutoMerge.meets_version_has_osi_license(pkg; pkg_code_path=pkgdir_from_depot(tmp_path, pkg))
+        withenv("JULIA_DEPOT_PATH" => tmp_path, "JULIA_PKG_SERVER" => "") do
+            run(`julia -e 'import Pkg; Pkg.Registry.add("General")'`)
+        end
         withenv("JULIA_DEPOT_PATH" => tmp_path) do
-            run(`julia -e 'using Pkg; Pkg.add(["RegistryCI"])'`)
+            run(`julia -e 'import Pkg; Pkg.add(["RegistryCI"])'`)
         end
         # Let's test ourselves and some of our dependencies that just have MIT licenses:
         result = has_osi_license_in_depot("RegistryCI")