Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

opam 2.1 integration #142

Merged
merged 13 commits into from
Nov 10, 2021
Merged

opam 2.1 integration #142

merged 13 commits into from
Nov 10, 2021

Conversation

rjbou
Copy link
Contributor

@rjbou rjbou commented Oct 4, 2021 •
edited
Loading

When opam depext is called with opam 2.1, it uses opam' internal depext mechanism (by calling opam for each features). Options are kept unchanged.
fix #141 & ocaml/opam#4854

@rjbou rjbou marked this pull request as draft October 4, 2021 12:47
@AltGr
Copy link
Contributor

AltGr commented Oct 5, 2021

Thanks! Maybe worth adding a note in the 2.1 case: You are using opam 2.1, where external dependency handling has been integrated: consider calling opam directly, the "depext" plugin interface is provided for backwards compatibility only

@rjbou
Copy link
Contributor Author

rjbou commented Oct 5, 2021

added!

@rjbou rjbou marked this pull request as ready for review October 8, 2021 09:24
rjbou
rjbou commented Oct 22, 2021
View reviewed changes
dra27 and others added 2 commits November 2, 2021 20:18
@dra27 @rjbou
Tweaks
863836f 
- Use functions to propagate --cli=2.1 automatically
- Treat the branching as 2.0 vs 2.1+
- Only display the warning if OPAMCLI isn't set to 2.0 (i.e. one's using
  opam 2.1 but not requested CLI 2.0)
- Set OPAMCLI=2.0 in the environment (will be ignored by the --cli=2.1
  calls)
@rjbou
fix install with no package given
160772c
dra27
dra27 reviewed Nov 3, 2021
View reviewed changes
Copy link
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

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

This seems to be working very nicely, apart from a slight regression with interactive modes

@dra27 dra27 mentioned this pull request Nov 5, 2021
Closed
dra27
dra27 approved these changes Nov 9, 2021
View reviewed changes
Copy link
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

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

LGTM!

@rjbou rjbou merged commit fb554cb into ocaml-opam:2.0 Nov 10, 2021
@rjbou rjbou added this to the 1.2 milestone Nov 10, 2021
@smorimoto smorimoto mentioned this pull request Nov 11, 2021
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@dra27 dra27 dra27 approved these changes

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

Successfully merging this pull request may close these issues.

opam-depext 1.2 for opam 2.1.0+
3 participants
@rjbou @AltGr @dra27