fixups for ExplicitImports.jl

Author: KristofferC

.github/workflows/check.yml

@@ -28,3 +28,30 @@ jobs:
       - uses: fredrikekre/runic-action@v1
         with:
           version: "1.4" # Keep version in sync with .pre-commit-config.yaml
+
+  explicit-imports:
+    runs-on: ubuntu-latest
+    name: "ExplicitImports.jl"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: 'nightly'
+      - uses: julia-actions/cache@v2
+      - uses: julia-actions/julia-buildpkg@v1
+      - name: Install dependencies
+        shell: julia {0}
+        run: |
+          # Add ExplicitImports.jl
+          using Pkg
+          Pkg.add([
+            PackageSpec(name = "ExplicitImports", version = "1.12"),
+          ])
+      - name: ExplicitImports.jl code checks
+        shell: julia --project {0}
+        run: |
+          using Pkg, ExplicitImports
+          # check_no_implicit_imports(Pkg) # `Pkg.Registry`: `@dateformat_str` bug in ExplicitImports?
+          # check_no_stale_explicit_imports(Pkg) # artifact_names in PkgArtifacts
+          check_all_qualified_accesses_via_owners(Pkg)
+          check_no_self_qualified_accesses(Pkg)

.pre-commit-config.yaml

@@ -15,30 +15,3 @@ repos:
       - id: runic
         additional_dependencies:
           - '[email protected]' # Keep version in sync with .github/workflows/Check.yml
-  
-  explicit-imports:
-    runs-on: ubuntu-latest
-    name: "ExplicitImports.jl"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: 'nightly'
-      - uses: julia-actions/cache@v2
-      - uses: julia-actions/julia-buildpkg@v1
-      - name: Install dependencies
-        shell: julia {0}
-        run: |
-          # Add ExplicitImports.jl
-          using Pkg
-          Pkg.add([
-            PackageSpec(name = "ExplicitImports", version = "1.12"),
-          ])
-      - name: ExplicitImports.jl code checks
-        shell: julia --project {0}
-        run: |
-          using Pkg, ExplicitImports
-          check_no_implicit_imports(Pkg)
-          # check_no_stale_explicit_imports(Pkg) # artifact_names in PkgArtifacts
-          check_all_qualified_accesses_via_owners(Pkg)
-          check_no_self_qualified_accesses(Pkg)

ext/REPLExt/REPLExt.jl

@@ -4,7 +4,8 @@ if Base.get_bool_env("JULIA_PKG_DISALLOW_PKG_PRECOMPILATION", false) == true
     error("Precompililing Pkg extension REPLExt is disallowed. JULIA_PKG_DISALLOW_PKG_PRECOMPILATION=$(ENV["JULIA_PKG_DISALLOW_PKG_PRECOMPILATION"])")
 end
 
-using Markdown, UUIDs, Dates
+import Dates
+using UUIDs: UUID
 
 import REPL
 import .REPL: LineEdit, REPLCompletions, TerminalMenus
@@ -339,6 +340,6 @@ function __init__()
     end
 end
 
-include("precompile.jl")
+# include("precompile.jl")
 
 end

src/API.jl

@@ -2,26 +2,25 @@
 
 module API
 
-using UUIDs
-using Printf
-import Random
-using Dates
+import FileWatching
 import LibGit2
 import Logging
-import FileWatching
+import Printf
+import Random
+using Dates: Dates, DateTime, Day, Period, now
+using UUIDs: UUIDs, UUID
 
-import Base: StaleCacheKey
+using Base.BinaryPlatforms
 
-import ..depots, ..depots1, ..logdir, ..devdir, ..printpkgstyle, .._autoprecompilation_enabled_scoped
 import ..Operations, ..GitTools, ..Pkg, ..Registry
+import ..TOML
+import ..depots1, ..logdir, ..devdir, ..printpkgstyle, .._autoprecompilation_enabled_scoped
 import ..can_fancyprint, ..pathrepr, ..isurl, ..PREV_ENV_PATH, ..atomic_toml_write
-using ..Types, ..TOML
-using ..Types: VersionTypes
-using Base.BinaryPlatforms
 import ..stderr_f, ..stdout_f
+import ..Resolve: ResolverError, ResolverTimeoutError
+using ..Types
 using ..Artifacts: artifact_paths
 using ..MiniProgressBars
-import ..Resolve: ResolverError, ResolverTimeoutError
 
 include("generate.jl")
 
@@ -583,7 +582,7 @@ function gc(ctx::Context = Context(); collect_delay::Period = Day(7), verbose =
     env = ctx.env
 
     # Only look at user-depot unless force=true
-    gc_depots = force ? depots() : [depots1()]
+    gc_depots = force ? Base.DEPOT_PATH : [depots1()]
 
     # First, we load in our `manifest_usage.toml` files which will tell us when our
     # "index files" (`Manifest.toml`, `Artifacts.toml`) were last used.  We will combine
@@ -1435,10 +1434,10 @@ function activate(path::AbstractString; shared::Bool = false, temp::Bool = false
             end
         end
     else
-        # initialize `fullpath` in case of empty `Pkg.depots()`
+        # initialize `fullpath` in case of empty `Pkg.Base.DEPOT_PATH`
         fullpath = ""
         # loop over all depots to check if the shared environment already exists
-        for depot in Pkg.depots()
+        for depot in Pkg.Base.DEPOT_PATH
             fullpath = joinpath(Pkg.envdir(depot), path)
             isdir(fullpath) && break
         end

src/Apps/Apps.jl

@@ -1,14 +1,14 @@
 module Apps
 
-using Pkg
-using Pkg: atomic_toml_write
-using Pkg.Versions
-using Pkg.Types: AppInfo, PackageSpec, Context, EnvCache, PackageEntry, Manifest, handle_repo_add!, handle_repo_develop!, write_manifest, write_project,
+using ..Pkg: atomic_toml_write
+using ..Pkg.Versions
+using ..Pkg.Types: AppInfo, PackageSpec, Context, EnvCache, PackageEntry, Manifest, handle_repo_add!, handle_repo_develop!, write_manifest,
     pkgerror, projectfile_path, manifestfile_path
-using Pkg.Operations: print_single, source_path, update_package_add
-using Pkg.API: handle_package_input!
-using TOML, UUIDs
-import Pkg.Registry
+using ..Pkg.Operations: print_single, source_path, update_package_add
+using ..Pkg.API: handle_package_input!
+import TOML
+using UUIDs: UUID
+import ..Registry
 
 app_env_folder() = joinpath(first(DEPOT_PATH), "environments", "apps")
 app_manifest_file() = joinpath(app_env_folder(), "AppManifest.toml")

src/Artifacts.jl

@@ -1,18 +1,19 @@
 module PkgArtifacts
 
-    using Artifacts, Base.BinaryPlatforms, SHA
-    using ..MiniProgressBars, ..PlatformEngines
+    import FileWatching
+    using Artifacts: @artifact_str, artifact_exists, artifact_hash, artifact_meta, artifact_path, find_artifacts_toml, select_downloadable_artifacts
+    using SHA: SHA, SHA256_CTX, sha256
     using Tar: can_symlink
-    using FileWatching: FileWatching
 
-    import ..set_readonly, ..GitTools, ..TOML, ..pkg_server, ..can_fancyprint,
-        ..stderr_f, ..printpkgstyle, ..mv_temp_dir_retries, ..atomic_toml_write
+    using Base.BinaryPlatforms
 
+    import Artifacts: artifact_names, artifact_paths, artifacts_dirs, pack_platform!, unpack_platform, load_artifacts_toml, query_override
     import Base: get, SHA1
-    import Artifacts: artifact_names, ARTIFACTS_DIR_OVERRIDE, ARTIFACT_OVERRIDES, artifact_paths,
-        artifacts_dirs, pack_platform!, unpack_platform, load_artifacts_toml,
-        query_override, with_artifacts_directory, load_overrides
+
+    import ..set_readonly, ..GitTools, ..TOML, ..pkg_server, ..can_fancyprint,
+        ..stderr_f, ..printpkgstyle, ..mv_temp_dir_retries, ..atomic_toml_write
     import ..Types: write_env_usage, parse_toml
+    using ..MiniProgressBars, ..PlatformEngines
 
     const Artifacts = PkgArtifacts # This is to preserve compatability for folks who depend on the internals of this module
     export Artifacts, create_artifact, artifact_exists, artifact_path, remove_artifact, verify_artifact,

src/BinaryPlatformsCompat.jl

@@ -87,16 +87,16 @@ module BinaryPlatformsCompat
     end
 
     # Next, things we don't need to coerce
-    for f in (:libgfortran_version, :libstdcxx_version, :platform_name, :wordsize, :platform_dlext, :tags, :triplet)
-        @eval begin
-            $(f)(p::PlatformUnion) = $(f)(p.p)
-        end
-    end
+    libgfortran_version(p::PlatformUnion) = libgfortran_version(p.p)
+    libstdcxx_version(p::PlatformUnion) = libstdcxx_version(p.p)
+    platform_name(p::PlatformUnion) = platform_name(p.p)
+    wordsize(p::PlatformUnion) = wordsize(p.p)
+    platform_dlext(p::PlatformUnion) = platform_dlext(p.p)
+    tags(p::PlatformUnion) = tags(p.p)
+    triplet(p::PlatformUnion) = triplet(p.p)
 
     # Finally, add equality testing between these wrapper types and other AbstractPlatforms
-    @eval begin
-        Base.:(==)(a::PlatformUnion, b::AbstractPlatform) = b == a.p
-    end
+    Base.:(==)(a::PlatformUnion, b::AbstractPlatform) = b == a.p
 
     # Add one-off functions
     MacOS(; kwargs...) = MacOS(:x86_64; kwargs...)

src/GitTools.jl

@@ -2,13 +2,12 @@
 
 module GitTools
 
+import LibGit2
+using SHA: SHA, SHA1_CTX, update!
+
+import ..can_fancyprint, ..printpkgstyle, ..stdout_f
 using ..Pkg
 using ..MiniProgressBars
-import ..can_fancyprint, ..printpkgstyle, ..stdout_f
-using SHA
-import Base: SHA1
-import LibGit2
-using Printf
 
 use_cli_git() = Base.get_bool_env("JULIA_PKG_USE_CLI_GIT", false)
 const RESOLVING_DELTAS_HEADER = "Resolving Deltas:"
@@ -75,7 +74,7 @@ function ensure_clone(io::IO, target_path, url; kwargs...)
     if ispath(target_path)
         return LibGit2.GitRepo(target_path)
     else
-        return GitTools.clone(io, url, target_path; kwargs...)
+        return clone(io, url, target_path; kwargs...)
     end
 end
 

src/MiniProgressBars.jl

@@ -2,7 +2,7 @@ module MiniProgressBars
 
 export MiniProgressBar, start_progress, end_progress, show_progress, print_progress_bottom
 
-using Printf
+using Printf: @sprintf
 
 # Until Base.format_bytes supports sigdigits
 function pkg_format_bytes(bytes; binary = true, sigdigits::Integer = 3)

src/Operations.jl

@@ -2,20 +2,23 @@
 
 module Operations
 
-using FileWatching: FileWatching
-using UUIDs
+import Dates
+import FileWatching
+import LibGit2
+import TOML
 using Random: randstring
-import LibGit2, Dates, TOML
+using UUIDs: UUID
 
-using ..Types, ..Resolve, ..PlatformEngines, ..GitTools, ..MiniProgressBars
-import ..depots, ..depots1, ..devdir, ..set_readonly, ..Types.PackageEntry
-import ..Artifacts: ensure_artifact_installed, artifact_names, extract_all_hashes,
-    artifact_exists, select_downloadable_artifacts, mv_temp_dir_retries
 using Base.BinaryPlatforms
+
 import ...Pkg
-import ...Pkg: pkg_server, Registry, pathrepr, can_fancyprint, printpkgstyle, stderr_f, OFFLINE_MODE
+import ...Pkg: Registry, pathrepr, can_fancyprint, printpkgstyle, stderr_f, OFFLINE_MODE
 import ...Pkg: UPDATED_REGISTRY_THIS_SESSION, RESPECT_SYSIMAGE_VERSIONS, should_autoprecompile
 import ...Pkg: usable_io, discover_repo
+import ..depots1, ..devdir, ..set_readonly, ..Types.PackageEntry
+import ..Artifacts: ensure_artifact_installed, artifact_names,
+    artifact_exists, select_downloadable_artifacts, mv_temp_dir_retries
+using ..Types, ..Resolve, ..PlatformEngines, ..GitTools, ..MiniProgressBars
 
 #########
 # Utils #
@@ -61,7 +64,7 @@ function find_installed(name::String, uuid::UUID, sha1::SHA1)
     slug_default = Base.version_slug(uuid, sha1)
     # 4 used to be the default so look there first
     for slug in (slug_default, Base.version_slug(uuid, sha1, 4))
-        for depot in depots()
+        for depot in Base.DEPOT_PATH
             path = abspath(depot, "packages", name, slug)
             ispath(path) && return path
         end
@@ -222,9 +225,9 @@ end
 function is_instantiated(env::EnvCache, workspace::Bool = false; platform = HostPlatform())::Bool
     # Load everything
     if workspace
-        pkgs = Operations.load_all_deps(env)
+        pkgs = load_all_deps(env)
     else
-        pkgs = Operations.load_all_deps_loadable(env)
+        pkgs = load_all_deps_loadable(env)
     end
     # If the top-level project is a package, ensure it is instantiated as well
     if env.pkg !== nothing
@@ -913,8 +916,8 @@ function install_git(
         GitTools.checkout_tree_to_path(repo, tree, version_path)
         return
     finally
-        repo !== nothing && LibGit2.close(repo)
-        tree !== nothing && LibGit2.close(tree)
+        repo !== nothing && close(repo)
+        tree !== nothing && close(tree)
     end
 end
 
@@ -2704,8 +2707,8 @@ function stat_rep(x::PackageSpec; name = true)
         rev = occursin(r"\b([a-f0-9]{40})\b", x.repo.rev) ? x.repo.rev[1:7] : x.repo.rev
     end
     subdir_str = x.repo.subdir === nothing ? "" : ":$(x.repo.subdir)"
-    repo = Operations.is_tracking_repo(x) ? "`$(x.repo.source)$(subdir_str)#$(rev)`" : ""
-    path = Operations.is_tracking_path(x) ? "$(pathrepr(x.path))" : ""
+    repo = is_tracking_repo(x) ? "`$(x.repo.source)$(subdir_str)#$(rev)`" : ""
+    path = is_tracking_path(x) ? "$(pathrepr(x.path))" : ""
     pinned = x.pinned ? "⚲" : ""
     return join(filter(!isempty, [name, version, repo, path, pinned]), " ")
 end
@@ -2989,7 +2992,7 @@ function print_status(
 
         pkg_downloaded = !is_instantiated(new) || is_package_downloaded(env.manifest_file, new)
 
-        new_ver_avail = !latest_version && !Operations.is_tracking_repo(new) && !Operations.is_tracking_path(new)
+        new_ver_avail = !latest_version && !is_tracking_repo(new) && !is_tracking_path(new)
         pkg_upgradable = new_ver_avail && cinfo !== nothing && isempty(cinfo[1])
         pkg_heldback = new_ver_avail && cinfo !== nothing && !isempty(cinfo[1])