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 for Pkg 1.6.2 #2592

Merged
merged 14 commits into from
Jun 11, 2021
Merged

Backports for Pkg 1.6.2 #2592

merged 14 commits into from
Jun 11, 2021

Conversation

fredrikekre
Copy link
Member

No description provided.

00vareladavid and others added 4 commits June 4, 2021 11:31
(cherry picked from commit d3a3d38, PR #2452)
(cherry picked from commit 97f8db8, PR#2465)
…aded modules (#2484)

(cherry picked from commit 879c21d, PR#2484)
src/API.jl Outdated
@@ -1141,7 +1144,8 @@ function precompile(ctx::Context; internal_call::Bool=false, strict::Bool=false,
end
try
ret = Logging.with_logger(Logging.NullLogger()) do
Base.compilecache(pkg, sourcepath, iob, devnull) # capture stderr, send stdout to devnull
# capture stderr, send stdout to devnull, don't skip loaded modules
Base.compilecache(pkg, sourcepath, iob, devnull, false)
Copy link
Member Author

@fredrikekre fredrikekre Jun 4, 2021

Choose a reason for hiding this comment

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

@IanButterworth is this change not backportable to 1.6.2? (See test failures)

Copy link
Member

Choose a reason for hiding this comment

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

JuliaLang/julia#40345 needs backporting to the base release branch, then CI here needs to be run against that branch

Copy link
Member

Choose a reason for hiding this comment

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

Could JuliaLang/julia#40702 be merged early and another started to continue base backports, so that this can be tested here?

Copy link
Member

Choose a reason for hiding this comment

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

DilumAluthge and others added 7 commits June 7, 2021 09:50
… prints the manifest to an IO (#2575)

(cherry picked from commit 6cf6b95)
…rints the project to an IO (#2581)

(cherry picked from commit 2341a06)
* limit the default number of precomp tasks to 16

* add JULIA_NUM_PRECOMPILE_TASKS to docs

(cherry picked from commit d4089a2)
(cherry picked from commit 53b12b6)
IanButterworth and others added 2 commits June 10, 2021 13:20
…old format (#2561)

* implement manifest format with deps field

* temporarily run CI on base PR

* simpler convert_flat_format_manifest

* default to old manifest format

* remove warning about maintaining old manifest format

* add unknown manifest format warning

* fix

* only print the major and minor part of the `manifest_format` to file

* add tests for manifest.toml formats

* add test for unknown manifest format warning

* provide manifest file path in warning, when available

* Revert "temporarily run CI on base PR"

This reverts commit d4a1e14.

* add support for unknown extra data in Manifest

* fixes

* add missing write_manifest method

* fix with windows-safe regex

Co-authored-by: KristofferC <[email protected]>
(cherry picked from commit a3fc759)

New manifest format: Fix `upgrade_manifest` and raw dict entry for nothing (#2610)

(cherry picked from commit b8bea6c)
Let's not allow for false-positive results from the PkgServer.

(cherry picked from commit 1e0a488)
@KristofferC KristofferC changed the title [WIP] Backports for Pkg 1.6.2 Backports for Pkg 1.6.2 Jun 10, 2021
@KristofferC
Copy link
Member

This passes locally on the 1.6.2 backport branch now.

@KristofferC
Copy link
Member

Not sure how to run CI properly here now since it needs to be run against a julia branch.

@KristofferC
Copy link
Member

I'll put this commit on the 1.6 backport branch so I can run PkgEval on it.

@fredrikekre fredrikekre merged commit 919cc28 into release-1.6 Jun 11, 2021
@fredrikekre fredrikekre deleted the fe/backports-release-1.6 branch June 11, 2021 09:19
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.

6 participants