-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rename Pkg -> OldPkg, Pkg3 -> Pkg #27095
Conversation
2bf76ac
to
94e0aaa
Compare
@@ -78,16 +78,16 @@ e.g., version 0.7 of Julia on a Linux system with a Julia executable at | |||
|
|||
### `JULIA_PKGDIR` | |||
|
|||
The path of the parent directory `Pkg.Dir._pkgroot()` for the version-specific |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TODO: Remove these docs.
@@ -118,7 +118,7 @@ $HOME/.julia_history | |||
### `JULIA_PKGRESOLVE_ACCURACY` | |||
|
|||
A positive `Int` that determines how much time the max-sum subroutine | |||
`MaxSum.maxsum()` of the package dependency resolver `Pkg.resolve` | |||
`MaxSum.maxsum()` of the package dependency resolver `OldPkg.resolve` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change to apply to Pkg.
089fcfc
to
3738d99
Compare
stdlib/Pkg/src/Operations.jl
Outdated
@@ -864,7 +864,10 @@ function build_versions(ctx::Context, uuids::Vector{UUID}; might_need_to_resolve | |||
open(log_file, "w") do log | |||
success(pipeline(cmd, stdout=log, stderr=log)) | |||
end ? Base.rm(log_file, force=true) : | |||
@error("Error building `$name`; see log file for further info") | |||
begin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop this commit, used for debugging.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good aside from a few minor issues I've commented on.
@@ -1121,7 +1122,7 @@ function create_expr_cache(input::String, output::String, concrete_deps::typeof( | |||
try | |||
write(in, """ | |||
begin | |||
import Pkg | |||
import OldPkg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we just delete this line now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not yet because OldPkg still puts, Pkg.dir
(the function) into load path.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, right. Deleting that is my job 😬...
base/sysimg.jl
Outdated
@@ -587,6 +587,7 @@ end | |||
@deprecate_binding Terminals root_module(Base, :REPL).Terminals true ", use `REPL.Terminals` instead" | |||
|
|||
@deprecate_binding Pkg root_module(Base, :Pkg) true ", run `using Pkg` instead" | |||
@deprecate_binding OldPkg root_module(Base, :OldPkg) true ", run `using OldPkg` instead" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems unlikely to happen, no? We can probably just skip this I would think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure
doc/src/manual/code-loading.md
Outdated
@@ -19,7 +19,7 @@ Understanding how Julia answers these questions is key to understanding package | |||
|
|||
## Federation of packages | |||
|
|||
Julia supports federated management of packages. This means that multiple independent parties can maintain both public and private packages and registries of them, and that projects can depend on a mix of public and private packages from different registries. Packages from various registries are installed and managed using a common set of tools and workflows. The Pkg3 next-generation package manager [[docs](https://julialang.org/Pkg3.jl/latest/), [repo](https://github.com/JuliaLang/Pkg3.jl)] ships with Julia 0.7/1.0 and lets you install and manage dependencies of your projects, by creating and manipulating project files, which describe what your project depends on, and manifest files that snapshot exact versions of your project's complete dependency graph. | |||
Julia supports federated management of packages. This means that multiple independent parties can maintain both public and private packages and registries of them, and that projects can depend on a mix of public and private packages from different registries. Packages from various registries are installed and managed using a common set of tools and workflows. The Pkg next-generation package manager [[docs](https://julialang.org/Pkg.jl/latest/), [repo](https://github.com/JuliaLang/Pkg.jl)] ships with Julia 0.7/1.0 and lets you install and manage dependencies of your projects, by creating and manipulating project files, which describe what your project depends on, and manifest files that snapshot exact versions of your project's complete dependency graph. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think you want to change these since these links are now broken. Unless you're planning on moving these repos?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought we would move the repo as well but can keep them until that has happened.
stdlib/Pkg/bin/stdlib.toml
Outdated
@@ -14,7 +14,8 @@ STDLIBS = [ | |||
"Logging", | |||
"Markdown", | |||
"Mmap", | |||
"Pkg", | |||
"OldPkg", | |||
"Pkg" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing trailing comma.
23aebec
to
46c6738
Compare
a0e0009
to
fc6b4b5
Compare
then tries paths in the global array `LOAD_PATH`. `require` is case-sensitive on | ||
all platforms, including those with case-insensitive filesystems like macOS and | ||
Windows. | ||
When searching for files, `require` first looks for package code under in the global array |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... code under in the ...
Just use in
. There are also 2 spaces after under
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, will fixup in a later PR.
fc6b4b5
to
7f53bc0
Compare
f7ec774
to
f009318
Compare
f009318
to
41f2046
Compare
fca8a88
to
1270eda
Compare
1270eda
to
b017863
Compare
global have_warned_session | ||
have_warned_session && return | ||
isinteractive() || return | ||
if !PKG3_IS_PRECOMPILED && !haskey(ENV, "JULIA_PKG3_DISABLE_PRECOMPILE_WARNING") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these env. variables also be renamed to *_PKG_*
? (Also, presumably the binaries will be compiled with this set, right?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are temporary and should be removed, see #27105
Details on the versions checks being used: JuliaLang/julia#25705 (544a5b8e39) => 0.7.0-DEV.3656 JuliaLang/julia#27095 (a209a45450) => 0.7.0-DEV.5183
Also incorporates #26426. Right now, I have to point to a fork for Compat since this name changes breaks it: KristofferC/Compat.jl@01f178a
Fixes #26522