Use the current std(out|err) for printing, fixes #2542. (#2543)

(cherry picked from commit ad3d639)

Author: fredrikekre

src/API.jl

@@ -16,6 +16,7 @@ import ..can_fancyprint, ..DEFAULT_IO
 using ..Types, ..TOML
 using ..Types: VersionTypes
 using Base.BinaryPlatforms
+import ..stderr_f, ..stdout_f
 using ..Artifacts: artifact_paths
 using ..MiniProgressBars
 
@@ -73,7 +74,7 @@ for f in (:develop, :add, :rm, :up, :pin, :free, :test, :build, :status)
     @eval begin
         $f(pkg::Union{AbstractString, PackageSpec}; kwargs...) = $f([pkg]; kwargs...)
         $f(pkgs::Vector{<:AbstractString}; kwargs...)          = $f([PackageSpec(pkg) for pkg in pkgs]; kwargs...)
-        function $f(pkgs::Vector{PackageSpec}; io::IO=DEFAULT_IO[], kwargs...)
+        function $f(pkgs::Vector{PackageSpec}; io::IO=$(f === :status ? :stdout_f : :stderr_f)(), kwargs...)
             ctx = Context()
             kwargs = merge((;kwargs...), (:io => io,))
             ret = $f(ctx, pkgs; kwargs...)
@@ -261,7 +262,7 @@ function up(ctx::Context, pkgs::Vector{PackageSpec};
     return
 end
 
-resolve(; io::IO=DEFAULT_IO[], kwargs...) = resolve(Context(;io); kwargs...)
+resolve(; io::IO=stderr_f(), kwargs...) = resolve(Context(;io); kwargs...)
 function resolve(ctx::Context; kwargs...)
     up(ctx; level=UPLEVEL_FIXED, mode=PKGMODE_MANIFEST, update_registry=false, kwargs...)
     return nothing
@@ -1422,7 +1423,7 @@ function status(ctx::Context, pkgs::Vector{PackageSpec}; diff::Bool=false, mode=
 end
 
 
-function activate(;temp=false, shared=false, io::IO=DEFAULT_IO[])
+function activate(;temp=false, shared=false, io::IO=stderr_f())
     shared && pkgerror("Must give a name for a shared environment")
     temp && return activate(mktempdir())
     Base.ACTIVE_PROJECT[] = nothing
@@ -1448,7 +1449,7 @@ function _activate_dep(dep_name::AbstractString)
         end
     end
 end
-function activate(path::AbstractString; shared::Bool=false, temp::Bool=false, io::IO=DEFAULT_IO[])
+function activate(path::AbstractString; shared::Bool=false, temp::Bool=false, io::IO=stderr_f())
     temp && pkgerror("Can not give `path` argument when creating a temporary environment")
     if !shared
         # `pkg> activate path`/`Pkg.activate(path)` does the following

src/Artifacts.jl

@@ -11,7 +11,7 @@ import ..GitTools
 import ..TOML
 import ..Types: parse_toml, write_env_usage, printpkgstyle
 import ..Pkg
-import ..Pkg: pkg_server, can_fancyprint, DEFAULT_IO
+import ..Pkg: pkg_server, can_fancyprint, stderr_f
 using ..Pkg.MiniProgressBars
 using ..PlatformEngines
 using SHA
@@ -286,7 +286,7 @@ end
 
 """
     download_artifact(tree_hash::SHA1, tarball_url::String, tarball_hash::String;
-                      verbose::Bool = false, io::IO=DEFAULT_IO[])
+                      verbose::Bool = false, io::IO=stderr)
 
 Download/install an artifact into the artifact store.  Returns `true` on success.
 
@@ -299,7 +299,7 @@ function download_artifact(
     tarball_hash::Union{String, Nothing} = nothing;
     verbose::Bool = false,
     quiet_download::Bool = false,
-    io::IO=DEFAULT_IO[],
+    io::IO=stderr_f(),
 )
     if artifact_exists(tree_hash)
         return true
@@ -386,7 +386,7 @@ end
                               pkg_uuid::Union{Base.UUID,Nothing}=nothing,
                               verbose::Bool = false,
                               quiet_download::Bool = false,
-                              io::IO=DEFAULT_IO[])
+                              io::IO=stderr)
 
 Ensures an artifact is installed, downloading it via the download information stored in
 `artifacts_toml` if necessary.  Throws an error if unable to install.
@@ -399,7 +399,7 @@ function ensure_artifact_installed(name::String, artifacts_toml::String;
                                    pkg_uuid::Union{Base.UUID,Nothing}=nothing,
                                    verbose::Bool = false,
                                    quiet_download::Bool = false,
-                                   io::IO=DEFAULT_IO[])
+                                   io::IO=stderr_f())
     meta = artifact_meta(name, artifacts_toml; pkg_uuid=pkg_uuid, platform=platform)
     if meta === nothing
         error("Cannot locate artifact '$(name)' in '$(artifacts_toml)'")
@@ -413,7 +413,7 @@ function ensure_artifact_installed(name::String, meta::Dict, artifacts_toml::Str
                                    platform::AbstractPlatform = HostPlatform(),
                                    verbose::Bool = false,
                                    quiet_download::Bool = false,
-                                   io::IO=DEFAULT_IO[])
+                                   io::IO=stderr_f())
     hash = SHA1(meta["git-tree-sha1"])
 
     if !artifact_exists(hash)
@@ -472,7 +472,7 @@ end
                                    include_lazy = false,
                                    verbose = false,
                                    quiet_download = false,
-                                   io::IO=DEFAULT_IO[])
+                                   io::IO=stderr)
 
 Installs all non-lazy artifacts from a given `(Julia)Artifacts.toml` file. `package_uuid` must
 be provided to properly support overrides from `Overrides.toml` entries in depots.
@@ -488,7 +488,7 @@ function ensure_all_artifacts_installed(artifacts_toml::String;
                                         include_lazy::Bool = false,
                                         verbose::Bool = false,
                                         quiet_download::Bool = false,
-                                        io::IO=DEFAULT_IO[])
+                                        io::IO=stderr_f())
     if !isfile(artifacts_toml)
         return
     end

src/Operations.jl

@@ -14,7 +14,7 @@ import ..Artifacts: ensure_all_artifacts_installed, artifact_names, extract_all_
 using Base.BinaryPlatforms
 import ...Pkg
 import ...Pkg: pkg_server
-import ...Pkg: can_fancyprint, DEFAULT_IO
+import ...Pkg: can_fancyprint, stderr_f
 import ..Types: printpkgstyle
 
 #########
@@ -567,7 +567,7 @@ function install_archive(
     urls::Vector{Pair{String,Bool}},
     hash::SHA1,
     version_path::String;
-    io::IO=DEFAULT_IO[]
+    io::IO=stderr_f()
 )::Bool
     tmp_objects = String[]
     url_success = false
@@ -686,7 +686,7 @@ end
 function download_artifacts(ctx::Context, pkg_roots::Vector{String};
                             platform::AbstractPlatform=HostPlatform(),
                             verbose::Bool=false,
-                            io::IO=DEFAULT_IO[])
+                            io::IO=stderr_f())
     # List of Artifacts.toml files that we're going to download from
     artifacts_tomls = String[]
 

src/Pkg.jl

@@ -32,7 +32,10 @@ devdir(depot = depots1()) = get(ENV, "JULIA_PKG_DEVDIR", joinpath(depots1(), "de
 envdir(depot = depots1()) = joinpath(depot, "environments")
 const UPDATED_REGISTRY_THIS_SESSION = Ref(false)
 const OFFLINE_MODE = Ref(false)
-const DEFAULT_IO = Ref{IO}()
+# For globally overriding in e.g. tests
+const DEFAULT_IO = Ref{Union{IO,Nothing}}(nothing)
+stderr_f() = something(DEFAULT_IO[], stderr)
+stdout_f() = something(DEFAULT_IO[], stdout)
 
 can_fancyprint(io::IO) = (io isa Base.TTY) && (get(ENV, "CI", nothing) != "true")
 
@@ -216,7 +219,7 @@ by starting julia with `--inline=no`.
 const test = API.test
 
 """
-    Pkg.gc(; io::IO=DEFAULT_IO[])
+    Pkg.gc(; io::IO=stderr)
 
 Garbage collect packages that are no longer reachable from any project.
 Only packages that are tracked by version are deleted, so no packages
@@ -226,9 +229,9 @@ const gc = API.gc
 
 
 """
-    Pkg.build(; verbose = false, io::IO=DEFAULT_IO[])
-    Pkg.build(pkg::Union{String, Vector{String}}; verbose = false, io::IO=DEFAULT_IO[])
-    Pkg.build(pkgs::Union{PackageSpec, Vector{PackageSpec}}; verbose = false, io::IO=DEFAULT_IO[])
+    Pkg.build(; verbose = false, io::IO=stderr)
+    Pkg.build(pkg::Union{String, Vector{String}}; verbose = false, io::IO=stderr)
+    Pkg.build(pkgs::Union{PackageSpec, Vector{PackageSpec}}; verbose = false, io::IO=stderr)
 
 Run the build script in `deps/build.jl` for `pkg` and all of its dependencies in
 depth-first recursive order.
@@ -242,8 +245,8 @@ redirecting to the `build.log` file.
 const build = API.build
 
 """
-    Pkg.pin(pkg::Union{String, Vector{String}}; io::IO=DEFAULT_IO[])
-    Pkg.pin(pkgs::Union{PackageSpec, Vector{PackageSpec}}; io::IO=DEFAULT_IO[])
+    Pkg.pin(pkg::Union{String, Vector{String}}; io::IO=stderr)
+    Pkg.pin(pkgs::Union{PackageSpec, Vector{PackageSpec}}; io::IO=stderr)
 
 Pin a package to the current version (or the one given in the `PackageSpec`) or to a certain
 git revision. A pinned package is never updated.
@@ -257,8 +260,8 @@ Pkg.pin(name="Example", version="0.3.1")
 const pin = API.pin
 
 """
-    Pkg.free(pkg::Union{String, Vector{String}}; io::IO=DEFAULT_IO[])
-    Pkg.free(pkgs::Union{PackageSpec, Vector{PackageSpec}}; io::IO=DEFAULT_IO[])
+    Pkg.free(pkg::Union{String, Vector{String}}; io::IO=stderr)
+    Pkg.free(pkgs::Union{PackageSpec, Vector{PackageSpec}}; io::IO=stderr)
 
 If `pkg` is pinned, remove the pin.
 If `pkg` is tracking a path,
@@ -273,8 +276,8 @@ const free = API.free
 
 
 """
-    Pkg.develop(pkg::Union{String, Vector{String}}; io::IO=DEFAULT_IO[])
-    Pkg.develop(pkgs::Union{Packagespec, Vector{Packagespec}}; io::IO=DEFAULT_IO[])
+    Pkg.develop(pkg::Union{String, Vector{String}}; io::IO=stderr)
+    Pkg.develop(pkgs::Union{Packagespec, Vector{Packagespec}}; io::IO=stderr)
 
 Make a package available for development by tracking it by path.
 If `pkg` is given with only a name or by a URL, the package will be downloaded
@@ -347,7 +350,7 @@ Request a `ProjectInfo` struct which contains information about the active proje
 const project = API.project
 
 """
-    Pkg.instantiate(; verbose = false, io::IO=DEFAULT_IO[])
+    Pkg.instantiate(; verbose = false, io::IO=stderr)
 
 If a `Manifest.toml` file exists in the active project, download all
 the packages declared in that manifest.
@@ -361,7 +364,7 @@ dependencies in the manifest and instantiate the resulting project.
 const instantiate = API.instantiate
 
 """
-    Pkg.resolve(; io::IO=DEFAULT_IO[])
+    Pkg.resolve(; io::IO=stderr)
 
 Update the current manifest with potential changes to the dependency graph
 from packages that are tracking a path.
@@ -390,7 +393,8 @@ const status = API.status
 
 
 """
-    Pkg.activate([s::String]; shared::Bool=false, io::IO=DEFAULT_IO[])
+    Pkg.activate([s::String]; shared::Bool=false, io::IO=stderr)
+    Pkg.activate(; temp::Bool=false, shared::Bool=false, io::IO=stderr)
 
 Activate the environment at `s`. The active environment is the environment
 that is modified by executing package commands.
@@ -544,7 +548,6 @@ const RegistrySpec = Types.RegistrySpec
 
 
 function __init__()
-    DEFAULT_IO[] = stderr
     if isdefined(Base, :active_repl)
         REPLMode.repl_init(Base.active_repl)
     else

src/PlatformEngines.jl

@@ -5,7 +5,7 @@
 module PlatformEngines
 
 using SHA, Downloads, Tar
-import ...Pkg: Pkg, TOML, pkg_server, depots1, can_fancyprint, DEFAULT_IO
+import ...Pkg: Pkg, TOML, pkg_server, depots1, can_fancyprint, stderr_f
 using ..MiniProgressBars
 using Base.BinaryPlatforms, p7zip_jll
 
@@ -242,7 +242,7 @@ function download(
     verbose::Bool = false,
     headers::Vector{Pair{String,String}} = Pair{String,String}[],
     auth_header::Union{Pair{String,String}, Nothing} = nothing,
-    io::IO=DEFAULT_IO[]
+    io::IO=stderr_f()
 )
     if auth_header === nothing
         auth_header = get_auth_header(url, verbose=verbose)
@@ -405,7 +405,7 @@ end
         force::Bool = false,
         verbose::Bool = false,
         quiet_download::Bool = false,
-        io::IO=DEFAULT_IO[],
+        io::IO=stderr,
     )
 
 Helper method to download tarball located at `url`, verify it matches the
@@ -440,7 +440,7 @@ function download_verify_unpack(
     force::Bool = false,
     verbose::Bool = false,
     quiet_download::Bool = false,
-    io::IO=DEFAULT_IO[],
+    io::IO=stderr_f(),
 )
     # First, determine whether we should keep this tarball around
     remove_tarball = false

src/Types.jl

@@ -11,7 +11,7 @@ import Base.string
 using REPL.TerminalMenus
 
 using TOML
-import ...Pkg, ..UPDATED_REGISTRY_THIS_SESSION, ..DEFAULT_IO
+import ...Pkg, ..UPDATED_REGISTRY_THIS_SESSION, ..stderr_f
 import ...Pkg: GitTools, depots, depots1, logdir, set_readonly, safe_realpath, pkg_server
 import Base.BinaryPlatforms: Platform
 import ..PlatformEngines: probe_platform_engines!, download, download_verify_unpack
@@ -313,7 +313,7 @@ include("manifest.jl")
 # ENV variables to set some of these defaults?
 Base.@kwdef mutable struct Context
     env::EnvCache = EnvCache()
-    io::IO = something(DEFAULT_IO[], stderr)
+    io::IO = stderr_f()
     use_libgit2_for_all_downloads::Bool = false
     use_only_tarballs_for_downloads::Bool = false
     num_concurrent_downloads::Int = 8