Use upstream_tag_template to get version from tag #959
Conversation
This file contains 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
|
Congratulations! One of the builds has completed. 🍾 You can install the built RPMs by following these steps:
Please note that the RPMs should be used only in a testing environment. |
This comment has been minimized.
This comment has been minimized.
|
Build succeeded.
|
|
As discussed on IRC this PR fixed your issue |
|
Thank you a lot. I will finally be able to remove the workarounds we have ;) |
the code part is finished, only integration tests and documentation is missing |
packit/upstream.py
Outdated
| # raw_version - version before processing by Upstream.get_version_from_tag() | ||
| raw_ver = self.command_handler.run_command( |
There was a problem hiding this comment.
Not sure if the comment gives us any new value.
Suggested change
| # raw_version - version before processing by Upstream.get_version_from_tag() | |
| raw_ver = self.command_handler.run_command( | |
| raw_ver = self.command_handler.run_command( |
| self.package_config.current_version_command, | ||
| return_output=True, | ||
| cwd=self.local_project.working_dir, | ||
| ).strip() | ||
| logger.debug(f"Version: {ver}") |
There was a problem hiding this comment.
Don't we want to log it? Or both?
packit/upstream.py
Outdated
Comment on lines
885
to
892
| try: | ||
| return p.match(tag).group(field) | ||
| except (IndexError, AttributeError): | ||
| logger.error( | ||
| f'Unable to extract "{field}" from {tag} using ' | ||
| f"{self.package_config.upstream_tag_template}" | ||
| ) | ||
| raise |
There was a problem hiding this comment.
I am looking for the time we can be python>=3.8 only and use Assignment Expressions.
But I would still try to avoid unnecessary try-except when not needed...
Suggested change
| try: | |
| return p.match(tag).group(field) | |
| except (IndexError, AttributeError): | |
| logger.error( | |
| f'Unable to extract "{field}" from {tag} using ' | |
| f"{self.package_config.upstream_tag_template}" | |
| ) | |
| raise | |
| match = p.match(tag) | |
| if match and field in match.groups(): | |
| return match.group(field) | |
| else: | |
| msg = ( | |
| f'Unable to extract "{field}" from {tag} using ' | |
| f"{self.package_config.upstream_tag_template}" | |
| ) | |
| logger.error(msg) | |
| raise PackitException(msg) |
There was a problem hiding this comment.
fixed
why you prefer if...else over try...except when dealing with unwanted errors?
tests/unit/test_upstream.py
Outdated
Comment on lines
38
to
40
| mock = flexmock(synced_files=None, upstream_package_name=upstream_package_name) | ||
| mock.should_receive("current_version_command") | ||
| return mock |
There was a problem hiding this comment.
You can use mock method to get the original flexmock instance:
Suggested change
| mock = flexmock(synced_files=None, upstream_package_name=upstream_package_name) | |
| mock.should_receive("current_version_command") | |
| return mock | |
| return flexmock( | |
| synced_files=None, | |
| upstream_package_name=upstream_package_name | |
| ).should_receive("current_version_command").mock() |
3 tasks
5 tasks
|
Build failed.
|
|
recheck |
|
Build failed.
|
TomasTomecek
approved these changes
Sep 18, 2020
|
recheck |
|
Build failed.
|
sakalosj
changed the title
Use package config variable upstream_tag_template to extract version from git tag.
|
Build failed.
|
|
recheck |
1 similar comment
|
recheck |
|
Build failed.
|
|
recheck |
1 similar comment
|
recheck |
|
Build failed.
|
|
recheck |
|
Build failed.
|
|
@jkonecny12 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use package config variable upstream_tag_template to extract version
from git tag.
TODO: