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

Backports to 1.0.1 #28764

Merged
merged 166 commits into from
Sep 26, 2018
Merged

Backports to 1.0.1 #28764

merged 166 commits into from
Sep 26, 2018

Conversation

KristofferC
Copy link
Member

@KristofferC KristofferC commented Aug 19, 2018

Non-merged PRs with backport label:

@ararslan
Copy link
Member

This is super cool! Excellent work as usual, Kristoffer!

@ararslan
Copy link
Member

I've looked through the changes and it all seems good to me, but it'd be nice to have some more eyes on it. I think we should call this good for 1.0.1 and put remaining backports into a 1.0.2.

@fredrikekre
Copy link
Member

We need #28822 too, includes lots of Pkg bugfixes.

@rfourquet
Copy link
Member

I made two small non-PR commits yesterday (doc typos) without thinking about backport, so I now just pushed them on this branch, hope it's ok.

fredrikekre and others added 21 commits September 7, 2018 23:28
* Update documented REPL banner for 1.0

(cherry picked from commit 7c9383f)
(cherry picked from commit 04f4884)
* Doc IndexLinear and IndexCartesian

(cherry picked from commit d15b091)
Add a punctuation

(cherry picked from commit 883c8a3)
(cherry picked from commit decee65)
(cherry picked from commit 2fcad41)
there is no real advantage in specializing on the argument types
for display since it goes through a quite complicated machinery
of trying to find applicable displays.

Before:
julia> let
        @time precompile(Tuple{typeof(Base.Multimedia.display), Int32})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Vector{Int}})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Float64})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Symbol})
       end
  0.034542 seconds (37.08 k allocations: 1.916 MiB)
  0.042272 seconds (92.57 k allocations: 4.810 MiB)
  0.039003 seconds (90.20 k allocations: 4.758 MiB)
  0.030826 seconds (61.08 k allocations: 3.066 MiB)

After:
julia> let
        @time precompile(Tuple{typeof(Base.Multimedia.display), Int32})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Vector{Int}})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Float64})
        @time precompile(Tuple{typeof(Base.Multimedia.display), Symbol})
       end

  0.000041 seconds (12 allocations: 640 bytes)
  0.000029 seconds (10 allocations: 544 bytes)
  0.000024 seconds (9 allocations: 496 bytes)
  0.000021 seconds (9 allocations: 496 bytes)

(cherry picked from commit eabb601)
To get out of REPL.

(cherry picked from commit 548d83f)
It was once an argument, but it's calculated on the first line, so...

(cherry picked from commit bcce68d)
(cherry picked from commit 7ffe704)
* improve performance for number to string conversion functions

(cherry picked from commit 472fe5f)
* Fix throw_complex_domainerror error message for log[1p]

This seems pretty clearly unintentional.  Relevant history is in
d4229be and
d555a9a.

* Require `Symbol` as first argument to `throw_complex_domainerror`

(cherry picked from commit a3a2b7a)
@ararslan
Copy link
Member

NewPkgEval showed regressions in the following packages:

So I think we're good! We just need to add #29354 to the backports here.

@ararslan
Copy link
Member

I noticed that our FreeBSD CI is down. I can run the tests manually on FreeBSD tomorrow to ensure we haven't affected that at all, though I suspect it'll be fine. Worth checking for a point release though.

@ararslan
Copy link
Member

I'm getting this on FreeBSD:

Test  (Worker) | Time (s) | GC (s) | GC % | Alloc (MB) | RSS (MB)
Long stacktrace printing: Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:536
  Expression: occursin("the last 2 lines are repeated 5000 more times", output[5])
Stacktrace:
 [1] macro expansion at /usr/home/alex/Projects/julia/test/errorshow.jl:536 [inlined]
 [2] macro expansion at /usr/home/alex/Projects/julia/usr/share/julia/stdlib/v1.0/Test/src/Test.jl:1083 [inlined]
 [3] top-level scope at /usr/home/alex/Projects/julia/test/errorshow.jl:526
Long stacktrace printing: Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:537
  Expression: (output[6])[1:8] == " [10003]"
   Evaluated: " [293] (" == " [10003]"
Stacktrace:
 [1] macro expansion at /usr/home/alex/Projects/julia/test/errorshow.jl:537 [inlined]
 [2] macro expansion at /usr/home/alex/Projects/julia/usr/share/julia/stdlib/v1.0/Test/src/Test.jl:1083 [inlined]
 [3] top-level scope at /usr/home/alex/Projects/julia/test/errorshow.jl:526
Worker 1 failed running test errorshow:
Some tests did not pass: 170 passed, 2 failed, 0 errored, 0 broken.errorshow: Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:536
  Expression: occursin("the last 2 lines are repeated 5000 more times", output[5])
Stacktrace:
 [1] record(::Test.DefaultTestSet, ::Test.Fail) at /usr/home/alex/Projects/julia/usr/share/julia/stdlib/v1.0/Test/src/Test.jl:745
 [2] (::getfield(Main, Symbol("##42#48")))() at /usr/home/alex/Projects/julia/test/runtests.jl:237
 [3] cd(::getfield(Main, Symbol("##42#48")), ::String) at ./file.jl:96
 [4] top-level scope at none:0
 [5] include at ./boot.jl:317 [inlined]
 [6] include_relative(::Module, ::String) at ./loading.jl:1041
 [7] include(::Module, ::String) at ./sysimg.jl:29
 [8] exec_options(::Base.JLOptions) at ./client.jl:229
 [9] _start() at ./client.jl:421
errorshow: Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:537
  Expression: (output[6])[1:8] == " [10003]"
   Evaluated: " [293] (" == " [10003]"
Stacktrace:
 [1] record(::Test.DefaultTestSet, ::Test.Fail) at /usr/home/alex/Projects/julia/usr/share/julia/stdlib/v1.0/Test/src/Test.jl:745
 [2] (::getfield(Main, Symbol("##42#48")))() at /usr/home/alex/Projects/julia/test/runtests.jl:237
 [3] cd(::getfield(Main, Symbol("##42#48")), ::String) at ./file.jl:96
 [4] top-level scope at none:0
 [5] include at ./boot.jl:317 [inlined]
 [6] include_relative(::Module, ::String) at ./loading.jl:1041
 [7] include(::Module, ::String) at ./sysimg.jl:29
 [8] exec_options(::Base.JLOptions) at ./client.jl:229
 [9] _start() at ./client.jl:421
Test Summary: | Pass  Fail  Total
  Overall     |  170     2    172
    errorshow |  170     2    172
    FAILURE
The global RNG seed was 0x2e9ab6a91be9125fd1f535af78f221c.
Error in testset errorshow:
Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:536
  Expression: occursin("the last 2 lines are repeated 5000 more times", output[5])
Error in testset errorshow:
Test Failed at /usr/home/alex/Projects/julia/test/errorshow.jl:537
  Expression: (output[6])[1:8] == " [10003]"
   Evaluated: " [293] (" == " [10003]"
ERROR: LoadError: Test run finished with errors
in expression starting at /usr/home/alex/Projects/julia/test/runtests.jl:61

It also happens on the release-1.0 branch though, so... ¯\_(ツ)_/¯, I guess. We had FreeBSD CI on that branch and it was working before, so I'm not sure what the deal is. Probably fine.

@ViralBShah
Copy link
Member

Unless @JeffBezanson or @vtjnash can fix this on freebsd looking at that log, I think we should release and perhaps fix freebsd in a later point release.

@StefanKarpinski
Copy link
Member

Or bisect to figure out which commit broke FreeBSD and then just drop that commit?

@KristofferC
Copy link
Member Author

It also happens on the release-1.0 branch though, ¯_(ツ)_/¯, I guess. We had FreeBSD CI on that branch and it was working before, so I'm not sure what the deal is. Probably fine.

@ararslan
Copy link
Member

Yeah I'd be fine releasing as-is given that it also fails on release-1.0. It might be something weird about my local environment, I guess. I'll try building the 1.0 tag locally to see if it happens there as well. We know that was verified good by CI.

@ararslan
Copy link
Member

Fails on a build of the 1.0 tag. I think we're fine.

fredrikekre and others added 4 commits September 26, 2018 11:20
unless the user has explicitly asked for it with
  --startup-file=yes

(cherry picked from commit 40d7f27f2ff08ec466df536f267129a9f5e950b4)
(cherry picked from commit eb96811)
(cherry picked from commit 57f7380a2641944be12695e92a3ad9f4cc20e6f2)
(cherry picked from commit 5829a40)
The tests use InteractiveUtils but it is not listed as a test dependency
in the SparseArrays Project.toml file. This is causing SparseArrays to fail
its tests when run on NewPkgEval, which means every package that uses
SparseArrays gets their tests skipped.

(cherry picked from commit f2ad009)
@ararslan ararslan changed the title [Do not merge] Backports to 1.0.1 Backports to 1.0.1 Sep 26, 2018
@ararslan
Copy link
Member

I plan to merge and push forward with a release once CI passes.

@ararslan
Copy link
Member

  LoadError: LoadError: Unsatisfiable requirements detected for package JSON [682c06a0]:
   JSON [682c06a0] log:
   ├─possible versions are: [0.1.0-0.1.1, 0.2.0-0.2.4, 0.3.0-0.3.9, 0.4.0-0.4.6, 0.5.0-0.5.4, 0.6.0-0.6.1, 0.7.0-0.7.1, 0.8.0-0.8.3, 0.9.0-0.9.1, 0.10.0, 0.11.0, 0.12.0, 0.13.0, 0.14.0, 0.15.0-0.15.2, 0.16.0-0.16.4, 0.17.1-0.17.2, 0.18.0, 0.19.0] or uninstalled
   ├─restricted to versions 0.16.0-0.16 by an explicit requirement, leaving only versions 0.16.0-0.16.4
   └─restricted by julia compatibility requirements to versions: [0.18.0, 0.19.0] or uninstalled — no versions left

@KristofferC
Copy link
Member Author

Yeah that one has to be backported as well...

@KristofferC
Copy link
Member Author

#29315 backported to fix that CI error

@ararslan
Copy link
Member

WHO LIKES RELEASES BECAUSE I DO

@ararslan ararslan merged commit 398d878 into release-1.0 Sep 26, 2018
@ararslan ararslan deleted the kc/backports_1.0.1 branch September 26, 2018 22:52
@KristofferC
Copy link
Member Author

Can someone help with removing some backport labels now... Or make a script that does it ;)

@StefanKarpinski
Copy link
Member

@KristofferC
Copy link
Member Author

As long as people make sure that the PR actually got backported. But if the script I used is not buggy, they all should have been...

@ararslan
Copy link
Member

You have a list at the top of the PR of things marked for backport that will need to be backported manually I assume due to merge conflicts. We'll just have to make sure those retain their label.

@KristofferC
Copy link
Member Author

All of those have been backported already. Where do you see that list?

@ararslan
Copy link
Member

"Non-merged PRs with backport label" section in the very top post of the PR.

@ararslan
Copy link
Member

Oh, I assumed that was "non-merged" as in "not merged into this branch," i.e. backported. Derp. Don't mind me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.