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

Remove discourse links #7144

Merged
merged 4 commits into from
Dec 25, 2022
Merged

Remove discourse links #7144

merged 4 commits into from
Dec 25, 2022

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Dec 25, 2022

Fixes #7141.

Copy link
Member

@webknjaz webknjaz left a comment

Choose a reason for hiding this comment

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

Anything in setup.cfg?

@Dreamsorcerer
Copy link
Member Author

Just grepped for 'discourse', so that should be all of them.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.9 labels Dec 25, 2022
@Dreamsorcerer Dreamsorcerer marked this pull request as ready for review December 25, 2022 18:44
@codecov
Copy link

codecov bot commented Dec 25, 2022

Codecov Report

Merging #7144 (4caa582) into master (6798629) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #7144   +/-   ##
=======================================
  Coverage   97.37%   97.37%           
=======================================
  Files         106      106           
  Lines       31093    31093           
  Branches     3875     3875           
=======================================
  Hits        30278    30278           
  Misses        613      613           
  Partials      202      202           
Flag Coverage Δ
CI-GHA 97.28% <ø> (ø)
OS-Linux 96.93% <ø> (-0.01%) ⬇️
OS-Windows 95.35% <ø> (ø)
OS-macOS 96.50% <ø> (ø)
Py-3.10.9 97.03% <ø> (ø)
Py-3.11.0 95.59% <ø> (ø)
Py-3.7.15 96.75% <ø> (ø)
Py-3.7.9 95.23% <ø> (ø)
Py-3.8.10 95.13% <ø> (ø)
Py-3.8.15 96.65% <ø> (ø)
Py-3.9.13 95.12% <ø> (+<0.01%) ⬆️
Py-3.9.16 96.66% <ø> (ø)
Py-pypy7.3.10 94.17% <ø> (-0.01%) ⬇️
VM-macos 96.50% <ø> (ø)
VM-ubuntu 96.93% <ø> (-0.01%) ⬇️
VM-windows 95.35% <ø> (ø)

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

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

@webknjaz webknjaz enabled auto-merge (squash) December 25, 2022 22:45
@webknjaz webknjaz merged commit 965c99f into master Dec 25, 2022
@webknjaz webknjaz deleted the Dreamsorcerer-patch-7 branch December 25, 2022 22:54
@patchback
Copy link
Contributor

patchback bot commented Dec 25, 2022

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

❌ Failed to cleanly apply 965c99f on top of patchback/backports/3.9/965c99f634e8f699f8df2e36cb7076bb137c4a4a/pr-7144

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

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.

Is aio-libs.discourse.group dead?
2 participants