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.

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

fix: bump pygithub requirement to handle conflict #37800

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Conversation

ankush
Copy link
Member

@ankush ankush commented Oct 31, 2023

This conflicts with pyjwt. Refer frappe/frappe#22882

This conflicts with pyjwt
@ankush
Copy link
Member Author

ankush commented Oct 31, 2023

@Mergifyio backport version-13

Copy link
Contributor

mergify bot commented Oct 31, 2023

backport version-13

✅ Backports have been created

@ankush ankush changed the title build: bump pygithub requirement fix: bump pygithub requirement to handle conflict Oct 31, 2023
@ankush ankush added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Oct 31, 2023
@ankush ankush merged commit 13d5eec into version-13-hotfix Oct 31, 2023
7 checks passed
@ankush ankush deleted the pygithub branch October 31, 2023 14:26
mergify bot pushed a commit that referenced this pull request Oct 31, 2023
build: bump pygithub requirement

This conflicts with pyjwt

(cherry picked from commit 13d5eec)
ankush added a commit that referenced this pull request Oct 31, 2023
…37808)

fix: bump pygithub requirement to handle conflict (#37800)

build: bump pygithub requirement

This conflicts with pyjwt

(cherry picked from commit 13d5eec)

Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2023
## [13.54.8](v13.54.7...v13.54.8) (2023-10-31)

### Bug Fixes

* bump pygithub requirement to handle conflict (backport [#37800](#37800)) ([#37808](#37808)) ([aaba335](aaba335))
frappe-pr-bot pushed a commit that referenced this pull request Nov 8, 2023
## [13.54.10](v13.54.9...v13.54.10) (2023-11-08)

### Bug Fixes

* add missing disbursement account in update_old_loans patch ([37b1a0e](37b1a0e))
* bump pygithub requirement to handle conflict ([#37800](#37800)) ([13d5eec](13d5eec))
* e-invoice jwt verification error ([#37818](#37818)) ([8f4ded6](8f4ded6))
* permission error while creating Supplier Quotation from Portal (backport [#37864](#37864)) ([#37872](#37872)) ([6952f0f](6952f0f))
* Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport [#37499](#37499)) ([#37918](#37918)) ([4789eca](4789eca))
* remove voucher type and no for Item and Warehouse based reposting (backport [#37849](#37849)) (backport [#37850](#37850)) ([#37938](#37938)) ([8cb0f69](8cb0f69))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.54.10 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants