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

[v1.28.x-0.49bx] Fix eachdist.py patch release to not add extra space #4289

Conversation

aabmass
Copy link
Member

@aabmass aabmass commented Nov 15, 2024

and make update-version-patch.sh executable

@aabmass aabmass requested a review from a team as a code owner November 15, 2024 20:14
@aabmass aabmass added the Skip generate-workflows To be used for release PRs label Nov 15, 2024
@@ -616,8 +616,9 @@ def update_patch_dependencies(targets, version, prev_version, packages):
operators_pattern = "|".join(re.escape(op) for op in operators)

for pkg in packages:
search = rf"({basename(pkg)}[^,]*)(\s?({operators_pattern})\s?)(.*{prev_version})"
replace = r"\1\2 " + version
search = rf"({basename(pkg)}[^,]*?)(\s?({operators_pattern})\s?)(.*{prev_version})"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For anyone reading this, I changed [^,]* to be lazy -> [^,]*? so the second group captures the whitespace. Then I remove the extra whitespace in the replace string

@aabmass aabmass merged commit 099616a into open-telemetry:release/v1.28.x-0.49bx Nov 15, 2024
352 checks passed
@aabmass aabmass deleted the patch-release-script-fix branch November 15, 2024 20:26
aabmass added a commit to aabmass/opentelemetry-python that referenced this pull request Nov 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip generate-workflows To be used for release PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant