Read package flags from OPAM metadata #328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you squash the Also, could you add a test with a non-empty flag? Thanks! |
Leonidas-from-XIV
force-pushed
the
base-packages-from-metadata
branch
2 times, most recently
from
06e52a9
to
7c9ca58
Compare
Leonidas-from-XIV
requested review from
samoht and
gridbugs
and removed request for
NathanReb
gridbugs
reviewed
Nov 24, 2022
This changes the logic from hardcoding the compiler "base packages" to instead read the OPAM flags to check whether the package in question is a compiler in which case it will be considered a base package. It also adds code to check for packages whether they are `conf` packages, which could be used to check for virtual packages. Inspired by tarides#327, this would allow `dkml-base-compiler` to be considered a base package and not accidentally vendor it. However it doesn't yet allow using the DKML compiler, because the name of the `ocaml` conf package is still hardcoded with no way to override it (yet).
The codebase always checks for base and virtual at the same time (sometimes using `is_virtual`, sometimes reimplementing `is_virtual`) so it can be folded into a single function that now also checks for the flags of the package to determine whether it is a compiler.
Leonidas-from-XIV
force-pushed
the
base-packages-from-metadata
branch
from
998dedf
to
37bda09
Compare
Also includes a comment on *why* these packages are excluded. Now with the compiler being auto-detected calling them "base" packages was confusing since it was unclear what makes them "base".
|
@gridbugs Can you take a look again? I've done some renaming and while thinking about it realized that even to me it was unclear what constituted a "base" package. With the compiler gone from the list it turns out that these are mostly build systems and dependencies of |
gridbugs
approved these changes
Nov 28, 2022
Leonidas-from-XIV
added a commit
to Leonidas-from-XIV/opam-repository
that referenced
this pull request
Dec 21, 2022
CHANGES: ### Changed - Treat packages with no build commands as if they can be built with dune (tarides/opam-monorepo#355, @gridbugs) ### Fixed - Fix resolving refs of locally pinned repositories (tarides/opam-monorepo#326, tarides/opam-monorepo#332, @hannesm, @Leonidas-from-XIV) - Read the `compiler` flag from OPAM metadata thus classifying more packages correctly as base packages (tarides/opam-monorepo#328, @Leonidas-from-XIV) - Fix bug where dev repo urls ending with a "/" would result in `opam monorepo pull` placing package source code directly inside the duniverse directory instead of in a subdirectory of the duniverse directory (tarides/opam-monorepo#359, @gridbugs)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the logic from hardcoding the compiler "base packages" to instead read the OPAM flags to check whether the package in question is a compiler in which case it will be considered a base package.
It also adds code to check for packages whether they are
confpackages, which could be used to check for virtual packages.Inspired by #327, this would allow
dkml-base-compilerto be considered a base package and not accidentally vendor it. However it doesn't yet allow using the DKML compiler, because the name of theocamlconf package is still hardcoded with no way to override it (yet).