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

[12.0][IMP] base_jsonify: Serialize Date and Datetime into ISO 8601 format #1714

Merged
merged 3 commits into from
Nov 1, 2019
Merged

[12.0][IMP] base_jsonify: Serialize Date and Datetime into ISO 8601 format #1714

merged 3 commits into from
Nov 1, 2019

Conversation

lmignon
Copy link
Contributor

@lmignon lmignon commented Oct 31, 2019

follows discussion #1711 (review)

@lmignon lmignon added this to the 13.0 milestone Oct 31, 2019
@lmignon
Copy link
Contributor Author

lmignon commented Oct 31, 2019

@hparfr @sbidoul here it's the fix following your comments on #1711 (review)

@lmignon lmignon force-pushed the 12.0-base-jsonify-dt-isoformat branch from df0998a to b5543b6 Compare October 31, 2019 15:53
@hparfr
Copy link
Contributor

hparfr commented Oct 31, 2019

Thanks

@moylop260
Copy link
Contributor

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-1714-by-moylop260-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 1, 2019
@OCA-git-bot
Merge PR #1714 into 12.0
c09a318 
Signed-off-by moylop260
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 12.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 12.0-ocabot-merge-pr-1714-by-moylop260-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 1, 2019
@OCA-git-bot
Merge PR #1714 into 12.0
5587387 
Signed-off-by moylop260
@OCA-git-bot OCA-git-bot merged commit b5543b6 into OCA:12.0 Nov 1, 2019
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 5587387. Thanks a lot for contributing to OCA. ❤️

@lmignon
Copy link
Contributor Author

lmignon commented Nov 2, 2019

@moylop260 Thank you for the merge but I'm very annoyed that these change are merged these without incrementing the version......
@sbidoul How can we create a new version? Do we have a new version published on Pypi If I make a new PR to manually increment the version number and we use the ocabot merge command?

@lmignon lmignon deleted the 12.0-base-jsonify-dt-isoformat branch November 2, 2019 07:56
@sbidoul
Copy link
Member

sbidoul commented Nov 2, 2019

@lmignon it is published, just with a .dev version.
But indeed doing ocabot merge without version bump should be exceptional.
To get a round version number on PyPI, just push a commit with the version bump to the main branch.

@lmignon
Copy link
Contributor Author

lmignon commented Nov 2, 2019

ok thank you @sbidoul

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

@sbidoul sbidoul sbidoul approved these changes

@hparfr hparfr hparfr approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lmignon @hparfr @moylop260 @OCA-git-bot @sbidoul