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

Ignore new deprecation message from setuptools. #7454

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Ignore new deprecation message from setuptools. #7454

merged 1 commit into from
Aug 3, 2023

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Jul 30, 2023

What do these changes do?

In setuptools 67.5.0+ (since pypa/setuptools@a1aeda3), a new DeprecationWarning is emitted whenever pkg_resources is imported, which we need to ignore during tests.

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."

@codecov
Copy link

codecov bot commented Jul 30, 2023

Codecov Report

Merging #7454 (d5bb13a) into master (36bc687) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #7454   +/-   ##
=======================================
  Coverage   97.27%   97.27%           
=======================================
  Files         106      106           
  Lines       31441    31441           
  Branches     3565     3565           
=======================================
  Hits        30585    30585           
  Misses        652      652           
  Partials      204      204           
Flag Coverage Δ
CI-GHA 97.22% <ø> (ø)
OS-Linux 96.89% <ø> (ø)
OS-Windows 95.34% <ø> (ø)
OS-macOS 96.57% <ø> (ø)
Py-3.10.11 95.27% <ø> (ø)
Py-3.10.12 96.78% <ø> (ø)
Py-3.11.4 96.51% <ø> (ø)
Py-3.8.10 95.24% <ø> (ø)
Py-3.8.17 96.71% <ø> (ø)
Py-3.9.13 95.23% <ø> (ø)
Py-3.9.17 96.74% <ø> (ø)
Py-pypy7.3.11 96.31% <ø> (-0.01%) ⬇️
VM-macos 96.57% <ø> (ø)
VM-ubuntu 96.89% <ø> (ø)
VM-windows 95.34% <ø> (ø)

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

Files Changed Coverage Δ
tests/test_circular_imports.py 93.54% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Dreamsorcerer
Copy link
Member

It's looking like we're stuck on uvloop at the moment: MagicStack/uvloop#547
I suspect that warning may also be from uvloop.

@webknjaz webknjaz added backport-3.8 bot:chronographer:skip This PR does not need to include a change note labels Aug 3, 2023
@webknjaz webknjaz merged commit 878ac7d into aio-libs:master Aug 3, 2023
28 of 33 checks passed
@patchback
Copy link
Contributor

patchback bot commented Aug 3, 2023

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

❌ Failed to cleanly apply 878ac7d on top of patchback/backports/3.8/878ac7d2331dbc19b3698b87ae6212e9010d5def/pr-7454

Backporting merged PR #7454 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.8/878ac7d2331dbc19b3698b87ae6212e9010d5def/pr-7454 upstream/3.8
  4. Now, cherry-pick PR Ignore new deprecation message from setuptools. #7454 contents into that branch:
    $ git cherry-pick -x 878ac7d2331dbc19b3698b87ae6212e9010d5def
    If it'll yell at you with something like fatal: Commit 878ac7d2331dbc19b3698b87ae6212e9010d5def is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 878ac7d2331dbc19b3698b87ae6212e9010d5def
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Ignore new deprecation message from setuptools. #7454 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/878ac7d2331dbc19b3698b87ae6212e9010d5def/pr-7454
  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.

@patchback
Copy link
Contributor

patchback bot commented Aug 3, 2023

Backport to 3.9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.9/878ac7d2331dbc19b3698b87ae6212e9010d5def/pr-7454

Backported as #7476

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

patchback bot pushed a commit that referenced this pull request Aug 3, 2023
@tjni tjni deleted the ignore-setuptools-warning branch August 3, 2023 14:34
Dreamsorcerer pushed a commit that referenced this pull request Aug 10, 2023
… setuptools. (#7476)

**This is a backport of PR #7454 as merged into master
(878ac7d).**
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants