Sourcery refactored dev/0.15.1 branch #2
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
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| return "{}/{}".format(args.namespace, args.project["name"]) | ||
| return f'{args.namespace}/{args.project["name"]}' |
There was a problem hiding this comment.
Function get_full_name refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
| "id": "{}/{}".format(get_full_name(args), args.project["version"]), | ||
| "id": f'{get_full_name(args)}/{args.project["version"]}', |
There was a problem hiding this comment.
Function add_version_to_package refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-66
to
+70
| raise Exception("Version {} already in packages JSON" | ||
| .format(args.project["version"]), | ||
| file=sys.stderr) | ||
| raise Exception( | ||
| f'Version {args.project["version"]} already in packages JSON', | ||
| file=sys.stderr, | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function main refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-20
to
-45
|
|
||
| description=description, | ||
| long_description=long_description, | ||
| long_description_content_type='text/markdown', | ||
|
|
||
| author="Fishtown Analytics", | ||
| author_email="info@fishtownanalytics.com", | ||
| url="https://github.com/fishtown-analytics/dbt", | ||
| packages=[], | ||
| install_requires=[ | ||
| 'dbt-core=={}'.format(package_version), | ||
| 'dbt-postgres=={}'.format(package_version), | ||
| 'dbt-redshift=={}'.format(package_version), | ||
| 'dbt-snowflake=={}'.format(package_version), | ||
| 'dbt-bigquery=={}'.format(package_version), | ||
| f'dbt-core=={package_version}', | ||
| f'dbt-postgres=={package_version}', | ||
| f'dbt-redshift=={package_version}', | ||
| f'dbt-snowflake=={package_version}', | ||
| f'dbt-bigquery=={package_version}', | ||
| ], | ||
| zip_safe=False, | ||
| classifiers=[ | ||
| 'Development Status :: 5 - Production/Stable', | ||
|
|
||
| 'License :: OSI Approved :: Apache Software License', | ||
|
|
||
| 'Operating System :: Microsoft :: Windows', | ||
| 'Operating System :: MacOS :: MacOS X', | ||
| 'Operating System :: POSIX :: Linux', | ||
|
|
There was a problem hiding this comment.
Lines 20-45 refactored with the following changes:
- Replace call to format with f-string [×5] (
use-fstring-for-formatting)
Comment on lines
-28
to
+30
| 'Asked to compile {} node, but it has no compiled form' | ||
| .format(model.resource_type) | ||
| f'Asked to compile {model.resource_type} node, but it has no compiled form' | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function _compiled_type_for refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-121
to
+119
| raise RuntimeError( | ||
| "Error showing deprecation warning: {}".format(name) | ||
| ) | ||
| raise RuntimeError(f"Error showing deprecation warning: {name}") |
There was a problem hiding this comment.
Function warn refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-18
to
+19
| path = "[%s]" % "][".join(map(repr, exc.relative_path)) | ||
| return 'at path {}: {}'.format(path, exc.message) | ||
| path = f'[{"][".join(map(repr, exc.relative_path))}]' | ||
| return f'at path {path}: {exc.message}' |
There was a problem hiding this comment.
Function validator_error_message refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring) - Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-63
to
+67
| if not hasattr(node, 'name'): | ||
| # we probably failed to parse a block, so we can't know the name | ||
| return '{} ({})'.format( | ||
| node.resource_type, | ||
| node.original_file_path | ||
| ) | ||
| return "{} {} ({})".format( | ||
| node.resource_type, | ||
| node.name, | ||
| node.original_file_path) | ||
| return ( | ||
| f"{node.resource_type} {node.name} ({node.original_file_path})" | ||
| if hasattr(node, 'name') | ||
| else f'{node.resource_type} ({node.original_file_path})' | ||
| ) |
There was a problem hiding this comment.
Function RuntimeException.node_to_string refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Replace call to format with f-string [×2] (
use-fstring-for-formatting)
This removes the following comments ( why? ):
# we probably failed to parse a block, so we can't know the name
Comment on lines
-89
to
+84
| lines.append("> {} {}".format( | ||
| msg, | ||
| self.node_to_string(item))) | ||
| lines.append(f"> {msg} {self.node_to_string(item)}") |
There was a problem hiding this comment.
Function RuntimeException.process_stack refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-99
to
+103
| node_string = " in {}".format(self.node_to_string(self.node)) | ||
| node_string = f" in {self.node_to_string(self.node)}" | ||
|
|
||
| if hasattr(self.msg, 'split'): | ||
| split_msg = self.msg.split("\n") | ||
| else: | ||
| split_msg = str(self.msg).split("\n") | ||
|
|
||
| lines = ["{}{}".format(self.type + ' Error', | ||
| node_string)] + split_msg | ||
| lines = ([f"{self.type} Error{node_string}"] + split_msg) | ||
|
|
||
| lines += self.process_stack() | ||
|
|
||
| return lines[0] + "\n" + "\n".join( | ||
| [" " + line for line in lines[1:]]) | ||
| return (lines[0] + "\n" + "\n".join([f" {line}" for line in lines[1:]])) |
There was a problem hiding this comment.
Function RuntimeException.__str__ refactored with the following changes:
- Replace call to format with f-string [×2] (
use-fstring-for-formatting) - Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation) - Simplify unnecessary nesting, casting and constant values in f-strings (
simplify-fstring-formatting)
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.
Branch
dev/0.15.1refactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
dev/0.15.1branch, then run:Help us improve this pull request!