Skip to content

Commit

Permalink
delete OldPkg
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Jul 4, 2018
1 parent ac65654 commit 4edce5a
Show file tree
Hide file tree
Showing 37 changed files with 15 additions and 8,225 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
pushd /tmp/julia/share/julia/test &&
if [ $(echo "$FILES_CHANGED" | grep -cv '^doc/') -gt 0 ]; then
/tmp/julia/bin/julia --check-bounds=yes runtests.jl all --skip Sockets | bar -i 30 &&
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online OldPkg/pkg Pkg/pkg download;
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online Pkg/pkg download;
fi &&
popd &&
mkdir /tmp/embedding-test &&
Expand Down
2 changes: 1 addition & 1 deletion .freebsdci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runtests(){

./usr/bin/julia --check-bounds=yes test/runtests.jl all
./usr/bin/julia --check-bounds=yes test/runtests.jl \
LibGit2/online OldPkg/pkg Pkg/pkg download
LibGit2/online Pkg/pkg download
}

test-embedding(){
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ script:
# skip tests if only files within the "doc" dir have changed
- if [ $(echo "$FILES_CHANGED" | grep -cv '^doc/') -gt 0 ]; then
/tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online OldPkg/pkg Pkg/pkg download; fi
/tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online Pkg/pkg download; fi
- popd
# test that the embedding code works on our installation
- mkdir /tmp/embedding-test &&
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ test_script:
- usr\bin\julia -e "Base.require(Main, :InteractiveUtils).versioninfo()"
- usr\bin\julia --sysimage-native-code=no -e "true"
- cd julia-* && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl all &&
.\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl LibGit2/online OldPkg/pkg Pkg/pkg download
.\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl LibGit2/online Pkg/pkg download
- cd ..
- usr\bin\julia usr\share\julia\test\embedding\embedding-test.jl test\embedding\embedding.exe
1 change: 0 additions & 1 deletion base/loading.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,6 @@ function create_expr_cache(input::String, output::String, concrete_deps::typeof(
try
write(in, """
begin
import OldPkg
$(Base.load_path_setup_code())
Base._track_dependencies[] = true
empty!(Base._concrete_dependencies)
Expand Down
2 changes: 0 additions & 2 deletions base/precompile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ precompile(Tuple{typeof(Base.show), Base.GenericIOBuffer{Array{UInt8, 1}}, UInt6
precompile(Tuple{typeof(Base.show), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, Array{Any, 1}})
precompile(Tuple{typeof(Base.show), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, Int64})
precompile(Tuple{typeof(Base.show), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, String})
precompile(Tuple{typeof(Base.show), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, typeof(OldPkg.dir)})
precompile(Tuple{typeof(Base.show), Base.IOContext{REPL.Terminals.TTYTerminal}, Base.MIME{Symbol("text/plain")}, Array{Float64, 1}})
precompile(Tuple{typeof(Base.show), Base.IOContext{REPL.Terminals.TTYTerminal}, Base.MIME{Symbol("text/plain")}, Array{Float64, 2}})
precompile(Tuple{typeof(Base.show), Base.IOContext{REPL.Terminals.TTYTerminal}, Base.MIME{Symbol("text/plain")}, Array{Int64, 1}})
Expand Down Expand Up @@ -480,7 +479,6 @@ precompile(Tuple{typeof(Markdown.terminline), Base.IOContext{Base.GenericIOBuffe
precompile(Tuple{typeof(Markdown.terminline), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, Markdown.Code})
precompile(Tuple{typeof(Markdown.terminline), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, String})
precompile(Tuple{typeof(Markdown.terminline_string), Base.IOContext{REPL.Terminals.TTYTerminal}, Array{Any, 1}})
precompile(Tuple{typeof(OldPkg.dir)})
precompile(Tuple{typeof(Pkg.REPLMode.create_mode), REPL.LineEditREPL, REPL.LineEdit.Prompt})
precompile(Tuple{typeof(REPL.LineEdit.accept_result), REPL.LineEdit.MIState, REPL.LineEdit.PrefixHistoryPrompt{REPL.REPLHistoryProvider}})
precompile(Tuple{typeof(REPL.LineEdit.activate), REPL.LineEdit.HistoryPrompt{REPL.REPLHistoryProvider}, REPL.LineEdit.SearchState, REPL.Terminals.TerminalBuffer, REPL.Terminals.TTYTerminal})
Expand Down
1 change: 0 additions & 1 deletion base/sysimg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ let
:Random,
:UUIDs,
:Future,
:OldPkg,
:LinearAlgebra,
:SparseArrays,
:SuiteSparse,
Expand Down
5 changes: 0 additions & 5 deletions doc/src/manual/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ over `$EDITOR`. If none of these environment variables is set, then the editor
is taken to be `open` on Windows and OS X, or `/etc/alternatives/editor` if it
exists, or `emacs` otherwise.

!!! note

`$JULIA_EDITOR` is *not* used in the determination of the editor for
`OldPkg.edit`: this function checks `$VISUAL` and `$EDITOR` alone.

## Parallelization

### `JULIA_CPU_CORES`
Expand Down
1 change: 0 additions & 1 deletion stdlib/InteractiveUtils/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
[deps]
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
OldPkg = "fe1c5a76-5840-53d2-82f9-288dd83ce2ce"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
19 changes: 5 additions & 14 deletions stdlib/InteractiveUtils/src/InteractiveUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using Base: unwrap_unionall, rewrap_unionall, isdeprecated, Bottom, show_unquote

using Markdown
using LinearAlgebra # for peakflops
import Pkg, OldPkg
import Pkg

include("editless.jl")
include("codeview.jl")
Expand Down Expand Up @@ -51,10 +51,12 @@ varinfo(pat::Regex) = varinfo(Main, pat)
Print information about the version of Julia in use. The output is
controlled with boolean keyword arguments:
- `packages`: print information about installed packages
- `verbose`: print all additional information
"""
function versioninfo(io::IO=stdout; verbose::Bool=false, packages::Bool=false)
function versioninfo(io::IO=stdout; verbose::Bool=false, packages::Union{Bool, Nothing}=nothing)
if packages !== nothing
depwarn("the packages keyword argument has been removed")
end
println(io, "Julia Version $VERSION")
if !isempty(Base.GIT_VERSION_INFO.commit_short)
println(io, "Commit $(Base.GIT_VERSION_INFO.commit_short) ($(Base.GIT_VERSION_INFO.date_string))")
Expand Down Expand Up @@ -115,17 +117,6 @@ function versioninfo(io::IO=stdout; verbose::Bool=false, packages::Bool=false)
println(io, str)
end
end
if packages || verbose
println(io, "Packages:")
println(io, " Package Directory: ", OldPkg.dir())
print(io, " Package Status:")
if isdir(OldPkg.dir())
println(io, "")
OldPkg.status(io)
else
println(io, " no packages installed")
end
end
end


Expand Down
16 changes: 5 additions & 11 deletions stdlib/InteractiveUtils/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,12 @@ end
# PR #23075
@testset "versioninfo" begin
# check that versioninfo(io; verbose=true) doesn't error, produces some output
# and doesn't invoke OldPkg.status which will error if JULIA_PKGDIR is set
mktempdir() do dir
withenv("JULIA_PKGDIR" => dir) do
buf = PipeBuffer()
versioninfo(buf, verbose=true)
ver = read(buf, String)
@test startswith(ver, "Julia Version $VERSION")
@test occursin("Environment:", ver)
@test occursin("Package Status:", ver)
@test occursin("no packages installed", ver)
@test isempty(readdir(dir))
end
buf = PipeBuffer()
versioninfo(buf, verbose=true)
ver = read(buf, String)
@test startswith(ver, "Julia Version $VERSION")
@test occursin("Environment:", ver)
end
let exename = `$(Base.julia_cmd()) --startup-file=no`
@test !occursin("Environment:", read(setenv(`$exename -e 'using InteractiveUtils; versioninfo()'`,
Expand Down
5 changes: 0 additions & 5 deletions stdlib/OldPkg/Project.toml

This file was deleted.

Loading

0 comments on commit 4edce5a

Please sign in to comment.