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.

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

Add flake8-no-implicit-concat #7731

Merged
merged 8 commits into from
Aug 31, 2024
Merged

Add flake8-no-implicit-concat #7731

merged 8 commits into from
Aug 31, 2024

Conversation

booniepepper
Copy link
Contributor

@booniepepper booniepepper commented Oct 18, 2023

What do these changes do?

This will forbid weird implicit string concatenations.

https://pypi.org/project/flake8-no-implicit-concat/

Are there changes in behavior for the user?

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@booniepepper
Copy link
Contributor Author

booniepepper commented Oct 18, 2023

(While a draft: Expecting the first attempt to fail, I'll update accordingly when I can make the time)

@webknjaz
Copy link
Member

May I ask you to keep the deps sorted alphabetically?

.pre-commit-config.yaml Outdated Show resolved Hide resolved
@Dreamsorcerer
Copy link
Member

(While a draft: Expecting the first attempt to fail, I'll update accordingly when I can make the time)

Think you need to enable the codes in the flake8 config. Probably just NIC001 and NIC101 (I'm not sure I want to disallow multi-line concatenations).

@webknjaz
Copy link
Member

webknjaz commented Nov 3, 2023

I'm not sure I want to disallow multi-line concatenations

I'd like to keep multiline implicit concat allowed.

setup.cfg Outdated Show resolved Hide resolved
@webknjaz
Copy link
Member

@booniepepper this will need a changelog fragment of the contrib type: https://docs.aiohttp.org/en/stable/contributing.html#adding-change-notes-with-your-prs.

@booniepepper
Copy link
Contributor Author

Going to rebase, then add the changelog entry. Thanks for your patience

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 30, 2024
@booniepepper booniepepper marked this pull request as ready for review August 30, 2024 21:18
@booniepepper booniepepper requested a review from asvetlov as a code owner August 30, 2024 21:18
@booniepepper booniepepper marked this pull request as draft August 30, 2024 21:19
Copy link

codecov bot commented Aug 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.27%. Comparing base (cc6d763) to head (c6ee062).
Report is 1072 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #7731   +/-   ##
=======================================
  Coverage   98.27%   98.27%           
=======================================
  Files         107      107           
  Lines       34226    34226           
  Branches     4058     4058           
=======================================
  Hits        33637    33637           
  Misses        416      416           
  Partials      173      173           
Flag Coverage Δ
CI-GHA 98.17% <100.00%> (ø)
OS-Linux 97.83% <100.00%> (ø)
OS-Windows 96.24% <100.00%> (ø)
OS-macOS 97.51% <100.00%> (ø)
Py-3.10.11 97.60% <100.00%> (ø)
Py-3.10.14 97.53% <100.00%> (ø)
Py-3.11.9 97.77% <100.00%> (ø)
Py-3.12.5 97.88% <100.00%> (ø)
Py-3.9.13 97.49% <100.00%> (ø)
Py-3.9.19 97.43% <100.00%> (ø)
Py-pypy7.3.16 97.04% <100.00%> (ø)
VM-macos 97.51% <100.00%> (ø)
VM-ubuntu 97.83% <100.00%> (ø)
VM-windows 96.24% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@booniepepper
Copy link
Contributor Author

If the configs are acceptable, I can format the things that aren't passing

@Dreamsorcerer
Copy link
Member

Yeah, I think that's good.

@booniepepper booniepepper marked this pull request as ready for review August 30, 2024 22:16
@booniepepper booniepepper marked this pull request as draft August 30, 2024 22:32
@booniepepper booniepepper marked this pull request as ready for review August 30, 2024 22:48
Co-authored-by: Sam Bull <git@sambull.org>
@Dreamsorcerer Dreamsorcerer added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot and removed backport-3.10 labels Aug 30, 2024
@booniepepper
Copy link
Contributor Author

booniepepper commented Aug 30, 2024

Is the test for 3.13 expected to fail? It looks unrelated to my change

(Edit) Yes, it's unrelated

@Dreamsorcerer Dreamsorcerer merged commit 1d170d3 into aio-libs:master Aug 31, 2024
36 of 37 checks passed
Copy link
Contributor

patchback bot commented Aug 31, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 1d170d3 on top of patchback/backports/3.11/1d170d37f476df705a9dcc3588e192e8ccb871c0/pr-7731

Backporting merged PR #7731 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/1d170d37f476df705a9dcc3588e192e8ccb871c0/pr-7731 upstream/3.11
  4. Now, cherry-pick PR Add flake8-no-implicit-concat #7731 contents into that branch:
    $ git cherry-pick -x 1d170d37f476df705a9dcc3588e192e8ccb871c0
    If it'll yell at you with something like fatal: Commit 1d170d37f476df705a9dcc3588e192e8ccb871c0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1d170d37f476df705a9dcc3588e192e8ccb871c0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add flake8-no-implicit-concat #7731 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/1d170d37f476df705a9dcc3588e192e8ccb871c0/pr-7731
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@Dreamsorcerer
Copy link
Member

If you could handle that backport as well, that'd be perfect.

@booniepepper
Copy link
Contributor Author

Thanks @Dreamsorcerer -- backport is here: #9006

Dreamsorcerer pushed a commit that referenced this pull request Sep 3, 2024
@booniepepper booniepepper deleted the patch-2 branch September 3, 2024 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR enhancement infra
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants