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.

Sign up for GitHub

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

Jump to bottom

1.6.1 backports #2425

Merged
merged 15 commits into from
Apr 14, 2021
Merged

1.6.1 backports #2425

merged 15 commits into from
Apr 14, 2021

Conversation

IanButterworth
Copy link
Member

@IanButterworth IanButterworth commented Mar 7, 2021 •
edited
Loading

PRs with backport label

Manual cherry-picks

Individual commit backports

  • Fix a typo in progress bar 8b0045d
  • fix STDLIBS_BY_VERSION on non-latest version of Julia ed19f82

DilumAluthge and others added 2 commits March 6, 2021 22:17
@DilumAluthge @IanButterworth
If user does e.g. Pkg.add("Foo.jl"), instruct them to do `Pkg.add("…
4fce2f1 
…Foo")` instead (JuliaLang#2099)

(cherry picked from commit 46eb2b2)
@IanButterworth
Avoid invalidations related to * string concat (JuliaLang#2325)
1fe975b 
* Avoid invalidations related to * string concat

* use same JULIA_PKG_SERVER setting for processcoverage to ensure registry is functional

(cherry picked from commit 42fc1bf)
@DilumAluthge DilumAluthge requested a review from fredrikekre March 7, 2021 04:07
@IanButterworth

This comment has been minimized.

Sign in to view
@DilumAluthge DilumAluthge marked this pull request as draft March 7, 2021 05:19
@IanButterworth IanButterworth mentioned this pull request Mar 7, 2021
Merged
@IanButterworth

This comment has been minimized.

Sign in to view
@IanButterworth IanButterworth marked this pull request as ready for review March 8, 2021 13:59
@DilumAluthge
Copy link
Member

@fredrikekre Is this good to go?

@DilumAluthge
Copy link
Member

I think probably these will all have to wait until 1.6.1, right?

@IanButterworth
Copy link
Member Author

Yeah, I thought that was the case anyway

On the off-chance these get snuck into 1.6.0

@DilumAluthge
Copy link
Member

Want to rename this to "1.6.1 backports" and add #2377?

@DilumAluthge DilumAluthge changed the title 1.6 backports 1.6.1 backports Mar 19, 2021
@IanButterworth
Copy link
Member Author

Would you mind taking over? I don't have bandwidth currently

@DilumAluthge
Copy link
Member

I actually have no idea how to backport a PR... maybe @fredrikekre or @KristofferC can take over this PR.

@IanButterworth IanButterworth mentioned this pull request Mar 26, 2021
Merged
IanButterworth and others added 4 commits March 27, 2021 09:50
@IanButterworth
Precompilation: Tidy report at end (JuliaLang#2457)
a26fe89 
* hide progress bar after precomp finishes

* indent precomp report

(cherry picked from commit 7cec904)
@00vareladavid @IanButterworth
Do not unnecessarily remove entries from compat (2419) (JuliaLang#2450)
2154fae 
Co-authored-by: David Varela <[email protected]>
(cherry picked from commit 8ad4425)
@KristofferC @IanButterworth
make progressbar adapt to size of terminal (JuliaLang#2437)
c4be257 
(cherry picked from commit 8139716)
@KristofferC @IanButterworth
fix a type in progress bar
af7e2c7 
(cherry picked from commit 8b0045d)
@IanButterworth
Copy link
Member Author

@KristofferC would standard practice to be to switch CI on this branch to 1.6 rather than nightly?

@IanButterworth IanButterworth force-pushed the ib/backports_16 branch 2 times, most recently from e09d23f to cdf685a Compare March 27, 2021 16:54
@IanButterworth IanButterworth mentioned this pull request Apr 3, 2021
Closed
@KristofferC KristofferC mentioned this pull request Apr 6, 2021
Merged
@IanButterworth IanButterworth mentioned this pull request Apr 6, 2021
Closed
@IanButterworth
Copy link
Member Author

@KristofferC now that I know about your backport script, I'm wondering if we should merge this (once tests pass) and start a new tidier one with your script?

Also, if we want to backport #2484 that will need JuliaLang/julia#40345 to be on the 1.6 base branch before tests pass.

00vareladavid and others added 6 commits April 14, 2021 10:24
@00vareladavid @KristofferC
Fix status output for pin/free, fixes JuliaLang#1931 (JuliaLang#2446)
30fa740 
(cherry picked from commit 91b6754)
@IanButterworth @KristofferC
run CI on 1.6
abe871d
@IanButterworth @KristofferC
Update docstrings for io kwargs, some io kwarg fixes (JuliaLang#2402)
24aad72 
(cherry picked from commit 6e8b621)
@KristofferC
fix STDLIBS_BY_VERSION on non-latest version of Julia
b22c725 
(cherry picked from commit fd1820e)
@IanButterworth @KristofferC
Precompilation: add tip to auto-precomp for getting error details (Ju…
1f07453 
…liaLang#2462)

* add tip to auto-precomp for getting error details

* switch tip to Pkg. API

* call -> run

(cherry picked from commit 0fa812e)
@Keno @KristofferC
precompile: Escape string in toml file (JuliaLang#2501)
0d33deb 
Drive by fix for the following issue in the output of the precompile

```
┌ Error: Error in the keymap
│   exception =
│    TOML Parser error:
│    C:\users\keno\Temp\jl_qpEfxR\registries\Registry\T/TestPkg\Package.toml:3:12 error: invalid uncidode scalar
│      repo = "C:\users\keno\Temp\jl_qpEfxR/TestPkg.jl"
│                 ^
│    Stacktrace:
│     [1] parse
│       @ .\toml_parser.jl:441 [inlined]
│     [2] Base.CachedTOMLDict(p::Base.TOML.Parser, path::String)
│       @ Base .\loading.jl:180
│     [3] (::Base.var"JuliaLang#810#811"{String, Base.TOMLCache})()
│       @ Base .\loading.jl:226
└ @ REPL.LineEdit Z:\home\keno\julia-win64\usr\share\julia\stdlib\v1.7\REPL\src\LineEdit.jl:2579
```

(cherry picked from commit 749541a)
@KristofferC KristofferC merged commit c78a8be into JuliaLang:release-1.6 Apr 14, 2021
@DilumAluthge
Copy link
Member

@KristofferC Did #2377 make it into this? I don't see it in the diff.

@KristofferC
Copy link
Member

KristofferC commented Apr 14, 2021 •
edited
Loading

Sorry, I made a comment about it but I seem to have not submitted it.

What I wrote was basically that I removed it from backport because:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fredrikekre fredrikekre Awaiting requested review from fredrikekre

@KristofferC KristofferC Awaiting requested review from KristofferC

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@IanButterworth @DilumAluthge @KristofferC @00vareladavid @Keno