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 release 1.6.1 #40209

Merged
merged 37 commits into from
Apr 17, 2021
Merged

Backports release 1.6.1 #40209

merged 37 commits into from
Apr 17, 2021

Conversation

KristofferC
Copy link
Member

@KristofferC KristofferC commented Mar 26, 2021

Backported PRs:

Non-merged PRs with backport label:

@KristofferC KristofferC added the release Release management and versioning. label Mar 26, 2021
@mkitti
Copy link
Contributor

mkitti commented Mar 30, 2021

I have a bugfix for #39798 in #39808. Minor change.

motchy869 and others added 24 commits April 4, 2021 12:17
(cherry picked from commit cc4690a)
* Fix #38491: fix an abspath() edge case on Windows

* Update base/path.jl

Co-authored-by: Jameson Nash <vtjnash@gmail.com>

* Update base/path.jl

* Update test/path.jl

Co-authored-by: Jameson Nash <vtjnash@gmail.com>

Co-authored-by: Mustafa M <mus-m@outlook.com>
Co-authored-by: Jameson Nash <vtjnash@gmail.com>
(cherry picked from commit f023677)
…40163)

* Have different Windows uninstall keys for different Julia versions

Should fix #40004.  Have the uninstall key to be "{#AppNameLong}_is1" where AppNameLong contains the Julia version to prevent Windows from overwriting the uninstall information for different Julia versions.

Inno Setup documentation about the AppId https://jrsoftware.org/ishelp/topic_setup_appid.htm copied here for convenience
```
[Setup]: AppId

Default value:

AppName
Description:

The value of AppId is stored inside uninstall log files (unins???.dat), and is checked by subsequent installations to determine whether it may append to a particular existing uninstall log. Setup will only append to an uninstall log if the AppId of the existing uninstall log is the same as the current installation's AppId. For a practical example, say you have two installations -- one entitled My Program and the other entitled My Program 1.1 Update. To get My Program 1.1 Update to append to My Program's uninstall log, you would have to set AppId to the same value in both installations.

AppId also determines the actual name of the Uninstall registry key, to which Inno Setup tacks on "_is1" at the end. (Therefore, if AppId is "MyProgram", the key will be named "MyProgram_is1".) Pre-1.3 versions of Inno Setup based the key name on the value of AppVerName.

AppId is a not used for display anywhere, so feel free to make it as cryptic as you desire. The value may include constants.

If you use a {code:..} constant to allow your user to customize AppId, you do not need to return the real value until just before the installation starts: if necessary you may return an empty or generic value at earlier times. If not empty, this value will only be used to attempt to restore previous install settings (like the settings stored by [Setup] section directive UsePreviousAppDir). If empty, it isn't used for anything.

The length of AppId with all constants evaluated should never exceed 127 characters.
Example:

AppId=MyProgram
```

* Use DirName as AppId

Co-authored-by: Mustafa M <mus-m@outlook.com>

* remove unneeded code

Co-authored-by: Mustafa M <mus-m@outlook.com>
(cherry picked from commit e2f5f26)
We copy-pasted the wrong macro here, should have used `CNAMEADDR()` not `CNAME()`.  This causes segfaults on armv7l processors by trying to read from an incorrect address when loading the trampoline target address value.

(cherry picked from commit 1897e08)
Fixes #39818
Fixes #39820
Fixes #39823

(cherry picked from commit 0988fcf)
…a file (#40208)

fix the TOML parser to parse 0e-3 and add an example of writing to a file

(cherry picked from commit 2ec75d6)
…helpers (#40161)

Due to the bug in the `GitCredential` constructor we were never writing
credential data to the credential helper effectively making our use of
git credential helpers read-only.

(cherry picked from commit ac50ac6)
(cherry picked from commit 0f828a2)
* add a missing propagate_inbounds

(cherry picked from commit 80002db)
Fixes #40303. When printing values to fixed widths through the
`Ryu.writefixed` or `Ryu.writeexp` routines, we have a "cleanup" section
after a value has been printed to see if it needs to be rounded given
the input precision and width. The core issue was the terminating
condition: it previously only checked if we were at the start of a
buffer or had encountered the `'-'` character. Via Printf formatting,
however, it also allows specifying the `'+'` and `' '` characters to
preceed a formatted number. Hence, in the OP, the `'1'` character was
getting "rounded" up to the `','` character. The fix here is correctly
checking if the `plus` or `space` options were passed to the routine and
if so, include those in our rounding termination check. The original
issue only reported the "plus" case for the `f` format specifier, but
the same bug affects the `e` format specifier and the "space" option.

(cherry picked from commit fcf6779)
* Fix relpath when path and startpath are in the same drive

When startpath == ".", assume the startpath is in the same drive.
This subsequently required tweaking the existing logic to then
canonicalize the drive casing in instances where the drive casing
differs.

(cherry picked from commit 89fff18)
(cherry picked from commit c889de7)
* fix #40258: nested string interpolation

fixes #40258

* fix interpolation with varargs

* add additional test case

* add additional test cases

Co-authored-by: Nathan Daly <NHDaly@gmail.com>

* keep previous behavior, don't try to be too smart

Co-authored-by: Nathan Daly <NHDaly@gmail.com>
Co-authored-by: Jeff Bezanson <jeff.bezanson@gmail.com>
(cherry picked from commit 637f52b)
(cherry picked from commit 5332d7d)
JeffBezanson and others added 8 commits April 11, 2021 21:59
* [build] Add `symlink_system_library` calls for CSL

We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration
(where we copy the CSL libraries into the Julia build tree) versus a
`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner
similar to other system libararies)

* Expand `JL_PRIVATE_LIBS-1` for versioned library names as well

Without this, we fail to install things like `libgcc_s.so.1` when
installed into the private libdir by `symlink_system_libraries`.

(cherry picked from commit 336cdf8)
* fix a typo in TOML error message

(cherry picked from commit e260f2b)
This avoids computing `length` unnecessarily, which often requires a
division, and is therefore often expensive.

(cherry picked from commit 40d4f4a)
also fixes part of #40065

(cherry picked from commit 00cf7b0)
@KristofferC

This comment has been minimized.

@nanosoldier

This comment has been minimized.

@KristofferC
Copy link
Member Author

@nanosoldier runtests(ALL, vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt

@KristofferC
Copy link
Member Author

@nanosoldier runtests(["ADNLPModels", "AnimalBreedingTools", "AxisKeys", "BifurcationKit", "DistributedOperations", "FameSVD", "Hecke", "ImageProjectiveGeometry", "IntervalTrees", "JuliaInterpreter", "Lale", "MINLPTests", "MPIReco", "MadNLP", "MusicManipulations", "NODAL", "NiceNumbers"], vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt

KristofferC and others added 2 commits April 14, 2021 11:21
Co-authored-by: Dilum Aluthge <dilum@aluthge.com>
(cherry picked from commit 2f0156a)
@KristofferC
Copy link
Member Author

KristofferC commented Apr 14, 2021

AxisKeys is mcabbott/AxisKeys.jl#57.

MadNLP passes locally.

I'll update JuliaInterpreter.

@KristofferC
Copy link
Member Author

@nanosoldier runtests(ALL, vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt

@KristofferC
Copy link
Member Author

@nanosoldier runtests(["AxisKeys", "BioMASS", "BlobTracking", "CancerImagingArchive", "Circuitscape", "DeepForest", "EliminateGraphs", "FastFloat16s", "FunctionOperators", "Graph500", "GtkObservables", "JSOSolvers", "SignalingDimension", "SimpleTypePrint"], vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt

@KristofferC KristofferC changed the title WIP: Backports release 1.6.1 Backports release 1.6.1 Apr 16, 2021
@KristofferC
Copy link
Member Author

@nanosoldier runbenchmarks(ALL, vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here. cc @christopher-dG

@KristofferC KristofferC merged commit 7cbb02d into release-1.6 Apr 17, 2021
@KristofferC KristofferC deleted the backports-release-1.6 branch April 17, 2021 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Release management and versioning.
Projects
None yet
Development

Successfully merging this pull request may close these issues.