fix: resolve merge conflict markers in CI workflows and upgrade Actions#742
Merged
Hananel-Hazan merged 1 commit intoBindsNET:masterfrom Apr 3, 2026
Merged
Conversation
- Resolve unmerged git conflict markers in python-app.yml and pythonpackage.yml by choosing the origin side (Python 3.13 support, Poetry 2.1.2), consistent with pyproject.toml and merged PR BindsNET#710. - Upgrade actions/checkout from v2/v3 to v4 and actions/setup-python from v2/v4 to v5 across all 3 workflows.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The CI workflows currently contain unresolved git merge conflict markers (
<<<<<<< HEAD,=======,>>>>>>> origin), making all CI checks non-functional.Resolve conflicts in
python-app.ymlandpythonpackage.ymlby choosing theoriginside: Python 3.13 in the test matrix, Poetry 2.1.2. This is consistent withpyproject.toml(python = ">=3.10,<3.14") and merged PR Support Python 3.13 #710 (Python 3.13 support).Upgrade GitHub Actions across all 3 workflow files:
actions/checkout: v2/v3 → v4actions/setup-python: v2/v4 → v5Test plan