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: Fix API endpoint for Frankfurter (backport #43476) #43479

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2024

Frankfurter just passed a breaking change which breaks the "frankfurter.app" endpoint for API calls. The new endpoint is "api.frankfurter.app".

re: #43472


This is an automatic backport of pull request #43476 done by Mergify.

cogk and others added 2 commits October 2, 2024 09:12
(cherry picked from commit 33e7211)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
#	erpnext/setup/install.py
(cherry picked from commit c444de0)

# Conflicts:
#	erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner October 2, 2024 09:12
@mergify mergify bot added the conflicts label Oct 2, 2024
@mergify mergify bot requested a review from ruthra-kumar as a code owner October 2, 2024 09:12
Copy link
Contributor Author

mergify bot commented Oct 2, 2024

Cherry-pick of 33e7211 has failed:

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

You are currently cherry-picking commit 33e72111c7.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
	both modified:   erpnext/setup/install.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of c444de0 has failed:

On branch mergify/bp/version-13-hotfix/pr-43476
Your branch is ahead of 'origin/version-13-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c444de017a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/setup/doctype/currency_exchange/test_currency_exchange.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@sagarvora sagarvora force-pushed the mergify/bp/version-13-hotfix/pr-43476 branch from 50b83c0 to 568118a Compare October 2, 2024 09:16
@sagarvora sagarvora closed this Oct 2, 2024
@sagarvora
Copy link
Collaborator

nothing to merge, so closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants