Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: psf/black
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 21.5b2
Choose a base ref
...
head repository: psf/black
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 21.6b0
Choose a head ref
  • 20 commits
  • 34 files changed
  • 10 contributors

Commits on Jun 1, 2021

  1. Correct max string length calculation when there are string operators (

    …#2292)
    
    PR #2286 did not fix the edge-cases (e.g. when the string is just long
    enough to cause a line to be 89 characters long). This PR corrects that
    mistake.
    bbugyi200 authored Jun 1, 2021
    Configuration menu
    Copy the full SHA
    a4e35b3 View commit details
    Browse the repository at this point in the history
  2. Add version to github action (and rewrite the whole thing while at …

    …it) (#1940)
    
    Commit history before merge:
    
    * Add black_version to github action
    * Merge upstream/main into this branch
    * Add version support for the Black action pt.2
    
      Since we're moving to a composite based action, quite a few changes
      were made. 1) Support was added for all OSes (Windows was painful). 
      2) Isolation from the rest of the workflow had to be done manually
      with a virtual environment.
    
      Other noteworthy changes:
    
      - Rewrote basically all of the logic and put it in a Python script
        for easy testing (not doing it here tho cause I'm lazy and I can't
        think of a reasonable way of testing it).
      - Renamed `black_version` to `version` to better fit the existing
        input naming scheme.
      - Added support for log groups, this makes our action's output a
        bit more fancy (I may or may have not added some debug output too).
    
    * Add more to and sorta rewrite the Action's docs
    
      Reflect compatability and gotchas.
    
    * Add CHANGELOG entry
    * Merge main into this branch
    * Remove debug; address typos; clean up action.yml
    
    Co-authored-by: Richard Si <[email protected]>
    stefanfoulis and ichard26 authored Jun 1, 2021
    Configuration menu
    Copy the full SHA
    4005246 View commit details
    Browse the repository at this point in the history
  3. Bump urllib3 from 1.26.4 to 1.26.5 (#2298)

    Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
    - [Release notes](https://github.com/urllib3/urllib3/releases)
    - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
    - [Commits](urllib3/urllib3@1.26.4...1.26.5)
    
    ---
    updated-dependencies:
    - dependency-name: urllib3
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 1, 2021
    Configuration menu
    Copy the full SHA
    fdc4b67 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Code Flag Options (#2259)

    Properly handles the diff, color, and fast option when black is run with
     the `--code` option.
    
    Closes #2104, closes #1801.
    HassanAbouelela authored Jun 2, 2021
    Configuration menu
    Copy the full SHA
    7567cdf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5de8c5f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f2a3fee View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Configuration menu
    Copy the full SHA
    df1c86c View commit details
    Browse the repository at this point in the history
  2. Add option to require a specific version to be running (#2300)

    Closes #1246: This PR adds a new option (and automatically a toml entry, hooray for existing configuration management 🎉) to require a specific version of Black to be running.
    
    For example: `black --required-version 20.8b -c "format = 'this'"`
    
    Execution fails straight away if it doesn't match `__version__`.
    felix-hilden authored Jun 3, 2021
    Configuration menu
    Copy the full SHA
    a2b5ba2 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Go back to single core for test suite on CI (#2305)

    The random asyncio bug is just too frequent and annoying to be
    worth the speed improvements. Our test suite is already quite fast.
    Random test failures hurt for 3 reasons, 1) they are discouraging for
    new contributors who won't understand it's out of their control, 2)
    it's annoying and time consuming to rerun the workflow, and 3) it
    makes single job failures feel less important (even they should be
    treated as important!).
    ichard26 authored Jun 4, 2021
    Configuration menu
    Copy the full SHA
    c53b3ad View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Configuration menu
    Copy the full SHA
    6380b9f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    99b68e5 View commit details
    Browse the repository at this point in the history
  3. [primer] Enable everything (#2288)

    See if we pass all our repos with experimental string processing enabled.
    Django probably needed:
    - Ignores >= 3.8 only
    
    We could support PEP440 version specifiers, but that would introduce the packaging module as a dependency that I'd like to avoid ... Or I could implement a poor persons version or vendor
    
    Commit history before merge:
     * [primer] Enable everything
     * Add exclude extend to django CLI args for primer
     * Change default timeout to from 5 to 10 mins for a primer project
     * Skip string normalization for Django
     * Limit Django to >= 3.8 due to := operator
    cooperlees authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    c1c2418 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Possible fix for issue with indentation and fmt: skip (#2281)

    Not sure the fix is right.  Here is what I found: issue is connected
    with line
    
        first.prefix = prefix[comment.consumed :]
    
    in `comments.py`.  `first.prefix` is a prefix of the line, that ends
    with `# fmt: skip`, but `comment.consumed` is the length of the
    `"  # fmt: skip"` string.  If prefix length is greater than 14,
    `first.prefix` will grow every time we apply formatting.
    
    Fixes #2254
    enzet authored Jun 8, 2021
    Configuration menu
    Copy the full SHA
    40fae18 View commit details
    Browse the repository at this point in the history
  2. Mention comment non-processing in documentation (#2306)

    This commit adds a short section discussing the non-processing of docstrings
    besides spacing improvements, mentions comment moving and links to the
    AST equivalence discussion. I also added a simple spacing test for good
    measure.
    
    Commit history before merge:
    
    * Mention comment non-processing in documentation, add spacing test
    * Mention special cases for comment spacing
    * Add all special cases, improve wording
    felix-hilden authored Jun 8, 2021
    Configuration menu
    Copy the full SHA
    a9eab85 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Regression fix: leave R prefixes capitalization alone (#2285)

    `black.strings.get_string_prefix` used to lowercase the extracted
    prefix before returning it. This is wrong because 1) it ignores the
    fact we should leave R prefixes alone because of MagicPython, and 2)
    there is dedicated prefix casing handling code that fixes issue 1.
    `.lower` is too naive.
    
    This was originally fixed in 20.8b0, but was reintroduced since 21.4b0.
    
    I also added proper prefix normalization for docstrings by using the
    `black.strings.normalize_string_prefix` helper.
    
    Some more test strings were added to make sure strings with capitalized
    prefixes aren't treated differently (actually happened with my original
    patch, Jelle had to point it out to me).
    ichard26 authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    00e7e12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    229498e View commit details
    Browse the repository at this point in the history
  3. Support named escapes (\N{...}) in string processing (#2319)

    Co-authored-by: Felix Hildén <[email protected]>
    Co-authored-by: Jelle Zijlstra <[email protected]>
    3 people authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    62402a3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2c5150c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    77021f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Configuration menu
    Copy the full SHA
    93c10bf View commit details
    Browse the repository at this point in the history
Loading