Skip to content
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

Merged
merged 17 commits into from
May 23, 2018
Merged

Rename Pkg -> OldPkg, Pkg3 -> Pkg #27095

merged 17 commits into from
May 23, 2018

Conversation

KristofferC
Copy link
Sponsor Member

@KristofferC KristofferC commented May 14, 2018

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

@KristofferC KristofferC added the packages Package management and loading label May 14, 2018
@@ -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
Copy link
Sponsor Member Author

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`
Copy link
Sponsor Member Author

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.

@KristofferC KristofferC force-pushed the kc/ye_olde_pkg branch 2 times, most recently from 089fcfc to 3738d99 Compare May 14, 2018 21:14
@@ -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
Copy link
Sponsor Member Author

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.

Copy link
Sponsor Member

@StefanKarpinski StefanKarpinski left a 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
Copy link
Sponsor Member

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?

Copy link
Sponsor Member Author

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.

Copy link
Sponsor Member

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"
Copy link
Sponsor Member

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.

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

@@ -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.
Copy link
Sponsor Member

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?

Copy link
Sponsor Member Author

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.

@@ -14,7 +14,8 @@ STDLIBS = [
"Logging",
"Markdown",
"Mmap",
"Pkg",
"OldPkg",
"Pkg"
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing trailing comma.

@Keno Keno added this to the 1.0 milestone May 17, 2018
@KristofferC KristofferC force-pushed the kc/ye_olde_pkg branch 3 times, most recently from 23aebec to 46c6738 Compare May 17, 2018 11:24
@KristofferC KristofferC force-pushed the kc/ye_olde_pkg branch 3 times, most recently from a0e0009 to fc6b4b5 Compare May 21, 2018 12:42
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
Copy link
Contributor

@iagobaapellaniz iagobaapellaniz May 21, 2018

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.

Copy link
Sponsor Member Author

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.

@StefanKarpinski StefanKarpinski merged commit a209a45 into master May 23, 2018
@fredrikekre fredrikekre deleted the kc/ye_olde_pkg branch May 23, 2018 21:19
@fredrikekre fredrikekre mentioned this pull request May 24, 2018
global have_warned_session
have_warned_session && return
isinteractive() || return
if !PKG3_IS_PRECOMPILED && !haskey(ENV, "JULIA_PKG3_DISABLE_PRECOMPILE_WARNING")
Copy link
Contributor

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?)

Copy link
Sponsor Member Author

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

Liozou pushed a commit to Liozou/julia that referenced this pull request May 24, 2018
omus added a commit to JuliaTesting/Mocking.jl that referenced this pull request Jun 27, 2018
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages Package management and loading
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants