Merge `stable` into `main`; Release 8.2.0 #2873

kdeldycke · 2025-03-26T11:15:52Z

In order to test the upcoming 8.2.0 release, I'm working on this PR that is trying to reconcile stable branch with the main branch.

Both branches have diverged a lot, and cannot be merged naively. This PR is fixing the conflicting changes which happened in both branches.

This PR particularly:

fix missing changes in documentation updates
update some links in documentation
fix running of typing job
fix running of pre-commit workflow
reconcile my main objective:
- Fix eagerness of help option generated by help_option_names #2811
- Move --help option defaults from its class to its decorator #2840
reconcile pager issues mentioned in Merge stable into main #2830:
- Use subprocess instead of os.system #1477
- Improve echo_via_pager behaviour in face of errors #2775

Relation to other proposals:

Supersedes Merge stable into main #2830 and release version 8.2.0 #2844
Addresses v8.2.0: Release Plan #2789

for more information, see https://pre-commit.ci

… into trim_args_section

…_args_section

…m_args_section

Co-authored-by: Andreas Backx <andreas@backx.org>

Remove the per-project files so we don't have to keep them in sync. GitHub's UI links to everything except the contributing guide, so add a section about that to the readme.

kdeldycke · 2025-03-27T14:58:06Z

All tests are passing, branches have been merged, this PR is ready for a 8.2.0 release of Click! 🚀

Refs: pallets/click#2873

Rowlando13

I reviewed all the docs and requirements file changes.

Accidental typo.

Rowlando13 · 2025-04-01T21:07:17Z

@kdeldycke Can you make a PR for this branch against stable to show that it resolves all the conflicts from stable into main, unless there is an easier way to show that.

Rowlando13 · 2025-04-02T02:12:45Z

Also thanks for this great PR! I wanted to fix the GitHub actions issues last week but did not get around to it.

kdeldycke · 2025-04-02T06:44:21Z

@kdeldycke Can you make a PR for this branch against stable to show that it resolves all the conflicts from stable into main, unless there is an easier way to show that.

I already had a hard time reconciling the two branches so not sure I can find a clean way. But I'll try.

kdeldycke · 2025-04-02T07:27:34Z

@kdeldycke Can you make a PR for this branch against stable to show that it resolves all the conflicts from stable into main, unless there is an easier way to show that.

I'm not sure I understand your request, as this PR is already merging with stable in commit 361915bbc3ccbe59a09585ecfd1fc30bb0697272, see:

Rowlando13 · 2025-04-02T22:50:46Z

This shows what I wanted. Thanks.

Rowlando13 · 2025-04-12T08:41:45Z

@kdeldycke Can you please fix the conflicts. @davidism Can you give this a review?

.github/workflows/publish.yaml

kdeldycke · 2025-04-23T05:40:25Z

@kdeldycke Can you please fix the conflicts. @davidism Can you give this a review?

Just fixed the merge conflicts.

Is it possible to wait too long in merging the main/stable branches? Because I don't have a lot of energy these days to reconcile the two code base again. Especially in light of enhancing the documentation with myst from #2886, which will probably overlaps changes in this PR.

@AndreasBackx tried to fix it 6 months ago in #2830 but abandoned. I tried last month but I find it difficult to keep this PR open. Can you please help me reduce the entropy caused by the branch divergence? 😣

Rowlando13 · 2025-04-24T18:13:08Z

Yes. Absolutely. I was not planning on merging anything until this is merged. I thought that the merge conflict was missed in the original work. Sorry if I created by merging something. I was waiting for a code review since it is so complex, but in light of it possibly not getting done for a long time, I am going to merge it.

kdeldycke · 2025-04-24T18:45:46Z

I just checked the result of that merge and haven't found any issue. main branch is now clean and contain all contributions from stable and other previously merged PRs. Click 8.2.0 is ready to be packaged and released.

Rowlando13 · 2025-04-25T03:02:33Z

Sweet!

Rowlando13 and others added 30 commits August 14, 2023 00:27

Rough out changes to arguments section.

30e907c

[pre-commit.ci] auto fixes from pre-commit.com hooks

fb325a4

for more information, see https://pre-commit.ci

Revert random file changes made by git.

63c03ab

Merge branch 'trim_args_section' of https://github.com/Rowlando13/click…

ba5b4ce

… into trim_args_section

Merge branch '8.1.x' of https://github.com/Rowlando13/click into trim…

c2e6f2e

…_args_section

Fix capitalization.

f0f5ce1

Merge branch 'stable' of https://github.com/Rowlando13/click into tri…

82ffa4b

…m_args_section

Rewrite arguments docs more nicely.

424d0e7

Fix broken admonition block.

e26d89d

More robust check of bash version (#2639)

273fb90

Cleanup handling files documentation.

50bfe23

Clarify environment variables section.

e835913

More concisely phrase Environment Variables section.

e0f59be

Fix a typo in File Opening Behaviors.

e9a76ba

Fix eagerness of help option generated by help_option_names (#2811)

70c673d

Co-authored-by: Andreas Backx <andreas@backx.org>

Use subprocess instead of os.system (#1477)

299efb8

Co-authored-by: Andreas Backx <andreas@backx.org>

Apply suggestions from code review for arguments docs.

9959aa9

add additional issues to changelog

9ce8bd8

Fixed missing reset on _compat.should_strip_ansi.

ffd43e9

Fix missing reset in isolation function (#2733)

fdc6b02

fix typos

b1e392e

update dev dependencies

6534590

remove test pypi

bed0377

Remove some typing hints.

3241541

Break up arguments section (#2586)

8e7bed0

Add links to third-party projects

822d4fd

Add links to third-party projects enhancing Click (#2815)

c23223b

release version 8.1.8

934813e

release version 8.1.8 (#2826)

4cef966

use global contributing guide

2cd85af

Remove the per-project files so we don't have to keep them in sync. GitHub's UI links to everything except the contributing guide, so add a section about that to the readme.

Release version 8.2.0

2a20aca

kdeldycke changed the title ~~Merge stable into main~~ Merge stable into main; Release 8.2.0 Mar 27, 2025

kdeldycke marked this pull request as ready for review March 27, 2025 14:57

This was referenced Mar 27, 2025

Merge stable into main #2830

Closed

release version 8.2.0 #2844

Closed

v8.2.0: Release Plan #2789

Closed

kdeldycke added a commit to kdeldycke/click-extra that referenced this pull request Mar 31, 2025

Rebase code upon the latest upcoming Click 8.2.0

3c9f830

Refs: pallets/click#2873

Rowlando13 previously approved these changes Apr 1, 2025

View reviewed changes

Rowlando13 marked this pull request as draft April 1, 2025 20:11

Rowlando13 marked this pull request as ready for review April 1, 2025 20:11

Rowlando13 reviewed Apr 12, 2025

View reviewed changes

.github/workflows/publish.yaml Show resolved Hide resolved

Rowlando13 linked an issue Apr 16, 2025 that may be closed by this pull request

v8.2.0: Release Plan #2789

Closed

34 tasks

Merge branch 'main' into main

c9b96fe

Rowlando13 merged commit b7c0ab4 into pallets:main Apr 24, 2025
12 checks passed

Rowlando13 added this to the 8.2.0 milestone Apr 27, 2025

Rowlando13 mentioned this pull request Apr 27, 2025

Release version 8.2.0 #2889

Merged

16 tasks

sebix mentioned this pull request May 6, 2025

Tag for 8.2.0 missing #2891

Closed

github-actions bot locked as resolved and limited conversation to collaborators May 12, 2025

Uh oh!

Merge stable into main; Release 8.2.0 #2873

Merge stable into main; Release 8.2.0 #2873

Uh oh!

Conversation

kdeldycke commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kdeldycke commented Mar 27, 2025

Uh oh!

Rowlando13 left a comment

Choose a reason for hiding this comment

Uh oh!

Rowlando13 commented Apr 1, 2025

Uh oh!

Rowlando13 commented Apr 2, 2025

Uh oh!

kdeldycke commented Apr 2, 2025

Uh oh!

kdeldycke commented Apr 2, 2025

Uh oh!

Rowlando13 commented Apr 2, 2025

Uh oh!

Rowlando13 commented Apr 12, 2025

Uh oh!

Uh oh!

kdeldycke commented Apr 23, 2025

Uh oh!

Rowlando13 commented Apr 24, 2025

Uh oh!

Uh oh!

kdeldycke commented Apr 24, 2025

Uh oh!

Rowlando13 commented Apr 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Merge `stable` into `main`; Release 8.2.0 #2873

Merge `stable` into `main`; Release 8.2.0 #2873

kdeldycke commented Mar 26, 2025 •

edited

Loading