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

Adapt to use Yojson 2.0 API (retry #299) #311

Merged
merged 10 commits into from
Aug 10, 2022
Merged

Adapt to use Yojson 2.0 API (retry #299) #311

merged 10 commits into from
Aug 10, 2022

Conversation

mjambon
Copy link
Collaborator

@mjambon mjambon commented Jul 21, 2022 •
edited
Loading

This branch should be equivalent to the original #299 by @Leonidas-from-XIV which got merged and then unmerged from master.

We're now waiting for a test to pass, which depends on a fix in yojson. Once yojson 2.0.2 is available, this should be good to merge. We have to run make test manually if the CI pipeline is broken due to problems with opam package versions.

PR checklist

  • New code has tests to catch future regressions
  • Documentation is up-to-date
  • CHANGES.md is up-to-date

@mjambon mjambon mentioned this pull request Jul 21, 2022
Merged
3 tasks
@Leonidas-from-XIV @mjambon
Port to new Yojson 2.0 API
75ad826 
It uses `Seq` instead of `Stream` so the compatibility package can be
dropped.

Likewise it uses `Buffer` instead of biniou, so the generator code needs
to be adapted.
@Leonidas-from-XIV @mjambon
Promote expected generated code
56465bd
@Leonidas-from-XIV @mjambon
Add entry to changelog
6208822
@mjambon
Copy link
Collaborator Author

mjambon commented Jul 21, 2022

I confirm that the fix ocaml-community/yojson#150 works:

  1. Uninstall the yojson package from opam
  2. Install the version of yojson with the fix (Fix out-of-bounds error in atdgen parsers ocaml-community/yojson#150) using make && make install
  3. Build and test atd with make && make test

@mbacarella
Copy link

Any blockers left? Any help needed to get this merged and released?

@mjambon
Copy link
Collaborator Author

mjambon commented Aug 9, 2022

Any blockers left? Any help needed to get this merged and released?

We're waiting for yojson 2.0.2 to be released, which fixes a bug in a function that's used by atdgen-generated code only and wasn't tested in yojson (ocaml-community/yojson#150).

@mjambon
Copy link
Collaborator Author

mjambon commented Aug 9, 2022

I just fixed the dependencies on yojson >= 2.0.2 in the opam files. This should be the last remaining error, based on manual testing I did earlier. Once yojson 2.0.2 or 2.1.0 is released, we will re-run the CI jobs and everything should be green at that point.

@Leonidas-from-XIV
Copy link
Contributor

I had hoped to get ocaml-community/yojson#147 merged before releasing 2.0.2 but oh well, might as well do the release today.

@Leonidas-from-XIV
Copy link
Contributor

2.0.2 released and waiting to get merged to OPAM-Repository: ocaml/opam-repository#21960

@mjambon mjambon merged commit 612505d into master Aug 10, 2022
@mjambon mjambon deleted the mj-yojson2 branch August 10, 2022 03:11
@Leonidas-from-XIV
Copy link
Contributor

Leonidas-from-XIV commented Aug 10, 2022 via email

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

@rgrinberg rgrinberg Awaiting requested review from rgrinberg rgrinberg is a code owner

@Khady Khady Awaiting requested review from Khady Khady is a code owner

@zindel zindel Awaiting requested review from zindel zindel is a code owner

@cyberhuman cyberhuman Awaiting requested review from cyberhuman cyberhuman is a code owner

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

Successfully merging this pull request may close these issues.
3 participants
@mjambon @mbacarella @Leonidas-from-XIV