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

perf: num2words, babel, gettext, sentry imports (backport #26475) #26476

Merged
merged 2 commits into from
May 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 18, 2024

num2words - 260KB - Used frequently on ERPNext sites.
babel - 1.1MB Gets imported because of dates, localization
sentry - 2.8MB should be loaded only if envvar is set
gettext - required for reading translations


This is an automatic backport of pull request #26475 done by [Mergify](https://mergify.com).

num2words - 260KB - Used frequently on ERPNext sites.
babel - 1.1MB Gets imported because of dates, localization
sentry - 2.8MB should be loaded only if envvar is set
gettext - required for reading translations

(cherry picked from commit 445e1db)

# Conflicts:
#	frappe/app.py
#	frappe/hooks.py
#	frappe/utils/sentry.py
@mergify mergify bot added the conflicts label May 18, 2024
Copy link
Contributor Author

mergify bot commented May 18, 2024

Cherry-pick of 445e1db has failed:

On branch mergify/bp/version-14-hotfix/pr-26475
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 445e1dbd6b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/boot.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   frappe/app.py
	both modified:   frappe/hooks.py
	deleted by us:   frappe/utils/sentry.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ankush May 18, 2024
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-26475 branch 3 times, most recently from ebcbdbc to 7c757be Compare May 20, 2024 05:02
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-26475 branch from 7c757be to a43a8cd Compare May 20, 2024 05:03
@ankush ankush enabled auto-merge (squash) May 20, 2024 05:03
@ankush ankush merged commit ea873fd into version-14-hotfix May 20, 2024
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-26475 branch May 20, 2024 05:19
frappe-pr-bot pushed a commit that referenced this pull request May 22, 2024
# [14.75.0](v14.74.1...v14.75.0) (2024-05-22)

### Bug Fixes

* "Not assigned" filter (backport [#26468](#26468)) ([#26469](#26469)) ([6bb3534](6bb3534))
* condition of event participants ([#26300](#26300)) ([#26455](#26455)) ([d940902](d940902))
* **contact list:** add space before designation ([a67ebab](a67ebab))
* Don't fiddle with child table indexes ([#26450](#26450)) ([#26452](#26452)) ([d0d6d93](d0d6d93))
* **DX:** Don't run CI if there are no tests (backport [#26457](#26457)) ([#26465](#26465)) ([d129c01](d129c01))
* enable fetch_from for Time fieldtype ([#25266](#25266)) ([#26471](#26471)) ([#26485](#26485)) ([9cd3bf6](9cd3bf6))
* **grid_row:** don't crash when undefined ([0f91073](0f91073))
* Ignore link doctype in comments ([#26484](#26484)) ([910d4a7](910d4a7))
* pass user and shared params when checking for cache keys ([#26402](#26402)) ([#26403](#26403)) ([30799f7](30799f7))
* preserve checked items after a search ([ae9cdd2](ae9cdd2))

### Features

* what's new (v15 port of [#21014](#21014)) (backport [#25986](#25986)) ([#26494](#26494)) ([6a561d9](6a561d9))

### Performance Improvements

* num2words, babel, gettext, sentry imports (backport [#26475](#26475)) ([#26476](#26476)) ([ea873fd](ea873fd))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.75.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants