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

Migrate packaging toward declarative setup.cfg #6165

Merged
merged 2 commits into from
Oct 28, 2021

Conversation

webknjaz
Copy link
Member

What do these changes do?

This patch revamps our packaging setup to follow modern practices more closely.

Are there changes in behavior for the user?

No.

Related issue number

N/A

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

@webknjaz webknjaz added enhancement infra meta dependencies Pull requests that update a dependency file backport-3.8 python Pull requests that update Python code labels Oct 28, 2021
webknjaz added a commit that referenced this pull request Oct 28, 2021
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 28, 2021
@webknjaz webknjaz enabled auto-merge (squash) October 28, 2021 20:28
@webknjaz webknjaz force-pushed the maintenance/declarative-setup.cfg branch 2 times, most recently from ca07ea3 to 5256a89 Compare October 28, 2021 20:39
@codecov
Copy link

codecov bot commented Oct 28, 2021

Codecov Report

Merging #6165 (ca07ea3) into master (06e653d) will not change coverage.
The diff coverage is n/a.

❗ Current head ca07ea3 differs from pull request most recent head 5256a89. Consider uploading reports for the commit 5256a89 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6165   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         102      102           
  Lines       30230    30230           
  Branches     2711     2711           
=======================================
  Hits        28204    28204           
  Misses       1849     1849           
  Partials      177      177           
Flag Coverage Δ
unit 93.22% <ø> (ø)

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


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 06e653d...5256a89. Read the comment docs.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Oct 28, 2021

This pull request fixes 1 alert when merging 5256a89 into 06e653d - view on LGTM.com

fixed alerts:

  • 1 for `__eq__` not overridden when adding attributes

@webknjaz webknjaz merged commit 850785c into master Oct 28, 2021
@webknjaz webknjaz deleted the maintenance/declarative-setup.cfg branch October 28, 2021 20:51
@patchback
Copy link
Contributor

patchback bot commented Oct 28, 2021

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

❌ Failed to cleanly apply 850785c on top of patchback/backports/3.8/850785c37ba69b3b6cfa7270d21224c95f86c487/pr-6165

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

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR dependencies Pull requests that update a dependency file enhancement infra meta python Pull requests that update Python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant