chore: use fstrings #4794
chore: use fstrings #4794
Conversation
branchvincent
force-pushed
the
fstrings
branch
from
bfc40f7
to
01aeb55
Compare
branchvincent
force-pushed
the
fstrings
branch
2 times, most recently
from
3027028
to
ea8bccf
Compare
| @@ -818,8 +812,8 @@ def test_create_venv_uses_patch_version_to_detect_compatibility( | |||
| del os.environ["VIRTUAL_ENV"] | |||
|
|
|||
| version = Version.parse(".".join(str(c) for c in sys.version_info[:3])) | |||
| poetry.package.python_versions = "^{}".format( | |||
| ".".join(str(c) for c in sys.version_info[:3]) | |||
| poetry.package.python_versions = "^" + ".".join( | |||
tests/utils/test_env.py
Outdated
| @@ -852,8 +846,8 @@ def test_create_venv_uses_patch_version_to_detect_compatibility_with_executable( | |||
| del os.environ["VIRTUAL_ENV"] | |||
|
|
|||
| version = Version.parse(".".join(str(c) for c in sys.version_info[:3])) | |||
| poetry.package.python_versions = "~{}".format( | |||
| ".".join(str(c) for c in (version.major, version.minor - 1, 0)) | |||
| poetry.package.python_versions = "~" + ".".join( | |||
There was a problem hiding this comment.
Above? This one is a little different but maybe still doable.
|
@branchvincent Sorry about the blockbuster review! There's a lot of churn here and it's important to both make sure our changes are beneficial as well as address any low-hanging code-quality fruit we discover. Thanks for bearing with me! |
|
Hey @branchvincent, just wanted to see if you were close to finishing this -- given the amount of churn, conflicts will build up quickly. If not I can easily pick up the torch, and we can also discuss merging without some of my proposed refactors if you're blocked on those. |
branchvincent
force-pushed
the
fstrings
branch
from
ea8bccf
to
6ad7bc9
Compare
|
thanks for the ping @neersighted, i've rebased / pushed my latest changes. the only thing i had left to address was the version specifier helper (see my reply #4794 (comment)). i'm 👍 to merge this and address that in a follow up |
| @@ -256,7 +242,7 @@ def and_to_string( | |||
| if this_line is not None: | |||
| buffer.append(" " + str(this_line)) | |||
There was a problem hiding this comment.
I think we might as well turn these in to f-strings (with !s) for consistency.
| @@ -256,7 +242,7 @@ def and_to_string( | |||
| if this_line is not None: | |||
| buffer.append(" " + str(this_line)) | |||
|
|
|||
| buffer.append(f" and {str(other)}") | |||
| buffer.append(f" and {other!s}") | |||
|
|
|||
| if other_line is not None: | |||
| buffer.append(" " + str(other_line)) | |||
| @@ -502,7 +498,7 @@ def test_deactivate_activated( | |||
| del os.environ["VIRTUAL_ENV"] | |||
|
|
|||
| venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent)) | |||
| version = Version.parse(".".join(str(c) for c in sys.version_info[:3])) | |||
| version = Version.from_parts(*sys.version_info[:3]) | |||
There was a problem hiding this comment.
Awesome change! This pattern is really common and I'd like to see us replace it more generally.
neersighted
force-pushed
the
fstrings
branch
from
6ad7bc9
to
ab6e7b3
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Pull Request Check List
Towards #4776