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.

Sign up for GitHub

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

Jump to bottom

fix magic comma and experimental string cache flags #2131

Merged
merged 4 commits into from
Apr 26, 2021
Merged

fix magic comma and experimental string cache flags #2131

merged 4 commits into from
Apr 26, 2021

Conversation

JelleZijlstra
Copy link
Collaborator

Fixes #2130

JelleZijlstra
JelleZijlstra commented Apr 25, 2021
View reviewed changes
src/black/__init__.py
@@ -273,9 +273,9 @@ class Mode:
target_versions: Set[TargetVersion] = field(default_factory=set)
line_length: int = DEFAULT_LINE_LENGTH
string_normalization: bool = True
is_pyi: bool = False
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Made them the same order as they appear in the cache file name for ease of understanding.

@JelleZijlstra JelleZijlstra marked this pull request as draft April 25, 2021 23:40
cooperlees
cooperlees approved these changes Apr 25, 2021
View reviewed changes
Copy link
Collaborator

@cooperlees cooperlees left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me, once CI passes. Just changes file formatting ...

CHANGES.md Show resolved Hide resolved
JelleZijlstra and others added 2 commits April 25, 2021 16:41
@JelleZijlstra @cooperlees
Update CHANGES.md
cce474a 
Co-authored-by: Cooper Lees <me@cooperlees.com>
@JelleZijlstra
fix tests
f7c9152
@JelleZijlstra JelleZijlstra marked this pull request as ready for review April 26, 2021 00:08
@JelleZijlstra
Copy link
Collaborator Author

@cooperlees I moved some code around in the tests to unbreak CI, could you take another look?

It turned out the DEFAULT_MODE in tests wasn't the same as the actual default on the command-line, which seemed wrong. To fix it I explicitly turned on --experimental-string-processing for the tests that rely on it.

cooperlees
cooperlees reviewed Apr 26, 2021
View reviewed changes
Copy link
Collaborator

@cooperlees cooperlees left a comment

Choose a reason for hiding this comment

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

These fixes make sense to me, but would love a second look from someone with a better handle on the cache and these tests implementation ...

@ichard26 ichard26 self-requested a review April 26, 2021 02:08
@ambv ambv merged commit 0a833b4 into master Apr 26, 2021
@ambv ambv deleted the fixcache branch April 26, 2021 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cooperlees cooperlees cooperlees approved these changes

@ichard26 ichard26 Awaiting requested review from ichard26

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cache does not get wiped when --skip-magic-trailing-comma changes
3 participants
@JelleZijlstra @cooperlees @ambv