Skip to content

Merge to private-preview#1784

Merged
jar-stripe merged 4 commits intoprivate-previewfrom
jar/merge-python-private-preview
Apr 1, 2026
Merged

Merge to private-preview#1784
jar-stripe merged 4 commits intoprivate-previewfrom
jar/merge-python-private-preview

Conversation

@jar-stripe
Copy link
Copy Markdown
Contributor

Why?

Routine merge of master changes into the private-preview release channel.

What?

  • Merged master into private-preview using sdk-codegen's automerge tooling (tools/automerge/python-private-preview.yaml)
  • Manually resolved one import conflict in stripe/_api_requestor.py: took master's _make_suitable_for_json import (replacing the unused _json_encode_date_callback)

See Also

xavdid and others added 4 commits March 25, 2026 18:35
… & add support for plain dicts (#1780)

* fix serialization of decimals

* use different method internally

* add kwarg for dumping to plain dict

---------

Co-authored-by: David Brownman <xavdid@stripe.com>
Committed-By-Agent: claude

# Conflicts:
#	CHANGELOG.md
#	VERSION
#	pyproject.toml
#	stripe/_api_requestor.py
#	stripe/_version.py
@jar-stripe jar-stripe requested a review from a team as a code owner March 31, 2026 23:18
@jar-stripe jar-stripe requested review from mbroshi-stripe and removed request for a team March 31, 2026 23:18
@jar-stripe jar-stripe enabled auto-merge March 31, 2026 23:19
@jar-stripe jar-stripe merged commit 45507c0 into private-preview Apr 1, 2026
17 checks passed
@jar-stripe jar-stripe deleted the jar/merge-python-private-preview branch April 1, 2026 17:51
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.

4 participants