Community App Store (Sourcery refactored) #162
Merged
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}
Comment on lines
-51
to
+59
| "Found --process-dependency-links flag, version {} doesn't need that yet though, removing.".format( | ||
| pip_version | ||
| ) | ||
| f"Found --process-dependency-links flag, version {pip_version} doesn't need that yet though, removing." | ||
| ) | ||
|
|
||
| args.remove("--process-dependency-links") | ||
|
|
||
| # strip --no-cache-dir for versions that don't support it | ||
| if pip_version not in cls.no_cache_dir and "--no-cache-dir" in args: | ||
| logger.debug( | ||
| "Found --no-cache-dir flag, version {} doesn't support that yet though, removing.".format( | ||
| pip_version | ||
| ) | ||
| f"Found --no-cache-dir flag, version {pip_version} doesn't support that yet though, removing." | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function PipCaller.clean_install_command refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-256
to
+253
| "Cannot use this pip install, can't write to the install dir and also can't use " | ||
| "--user for installing. Check your setup and the permissions on {}.".format( | ||
| pip_install_dir | ||
| ) | ||
| f"Cannot use this pip install, can't write to the install dir and also can't use --user for installing. Check your setup and the permissions on {pip_install_dir}." | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function PipCaller._setup_pip refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-318
to
+313
| 'Using "{}" as command to invoke pip'.format(" ".join(command)) | ||
| f'Using "{" ".join(command)}" as command to invoke pip' | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function PipCaller.autodetect_pip refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-326
to
+320
| if isinstance(pip_command, list): | ||
| sarge_command = pip_command | ||
| else: | ||
| sarge_command = [pip_command] | ||
| sarge_command = pip_command if isinstance(pip_command, list) else [pip_command] |
There was a problem hiding this comment.
Function PipCaller.to_sarge_command refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-345
to
+338
| "Using cached pip version information for {}".format( | ||
| pip_command_str | ||
| ) | ||
| f"Using cached pip version information for {pip_command_str}" | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function PipCaller._get_pip_version refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
conreq/_core/app_store/utils/pip.py
Outdated
Comment on lines
410
to
399
| self._logger.debug( | ||
| "Using cached pip setup information for {}".format(pip_command_str) | ||
| ) | ||
| self._logger.debug(f"Using cached pip setup information for {pip_command_str}") |
There was a problem hiding this comment.
Function PipCaller._check_pip_setup refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting) - Replace dict.get(x, None) with dict.get(x) (
remove-none-from-default-get)
Comment on lines
-550
to
+536
| "pip installs to {} (writable -> {}), --user flag needed -> {}, " | ||
| "virtual env -> {}".format( | ||
| install_dir, | ||
| "yes" if writable else "no", | ||
| "yes" if user_flag else "no", | ||
| "yes" if virtual_env else "no", | ||
| ) | ||
| f'pip installs to {install_dir} (writable -> {"yes" if writable else "no"}), --user flag needed -> {"yes" if user_flag else "no"}, virtual env -> {"yes" if virtual_env else "no"}' | ||
| ) | ||
| self._logger.info("==> pip ok -> {}".format("yes" if ok else "NO!")) | ||
|
|
||
| self._logger.info(f'==> pip ok -> {"yes" if ok else "NO!"}') |
There was a problem hiding this comment.
Function LocalPipCaller._check_pip_setup refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
sourcery-ai
bot
force-pushed
the
sourcery/app_store
branch
from
67c187d
to
7abd52b
Compare
for more information, see https://pre-commit.ci
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.
Pull Request #69 refactored by Sourcery.
If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.
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
app_storebranch, then run:Help us improve this pull request!