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

Release 21.1.2 #10012

Merged
merged 14 commits into from
May 23, 2021
Merged

Release 21.1.2 #10012

merged 14 commits into from
May 23, 2021

Conversation

sbidoul
Copy link
Member

@sbidoul sbidoul commented May 23, 2021

Also, fix the towncrier template.

dmerejkowsky and others added 14 commits May 23, 2021 10:39
This adds a check before invoking 'egg_info' to make sure either setup.py or
setup.cfg actually exists, and emit a clearer error message when neither can
be found and the egg_info command can never succeed.
This change ensures that when pip is executed from a wheel/zip,
standalone pip creation for build environment reuses the source.

Resolves: pypa#9953
Co-authored-by: Tzu-ping Chung <[email protected]>
Co-authored-by: Tzu-ping Chung <[email protected]>
The resolver collects previously known incompatibilites and sends them
to the provider. But previously the provider does not correctly exclude
the currently-installed candidate if it is present in that
incompatibility list, causing the resolver to enter a loop trying that
same candidate. This patch correctly applies incompat_ids when producing
an AlreadyInstalledCandidate and exclude it if its id() is in the set.
It looks like towncrier unconditionally writes top_line
when it is defined in the title_format configuration.
So we must not repeat it in the template.
When running towncrier with --draft, it works differently
so in that case the top line is not shown...
@sbidoul sbidoul added skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes labels May 23, 2021
@sbidoul sbidoul merged commit 220b30b into pypa:main May 23, 2021
@sbidoul sbidoul deleted the release/21.1.2 branch May 23, 2021 10:34
@@ -1,6 +1,6 @@
{% set underline = "=" %}
{{ top_line }}
Copy link
Member

Choose a reason for hiding this comment

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

@pradyunsg @sbidoul FYI this change has completely removed the draft release title. See: https://pip.pypa.io/en/stable/news/

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, that is interesting. I wanted to fix the release process which produced a duplicate title.
From a quick look at the towncrier source code I could not find a way to make it work consistently in draft and non draft mode when title_format is set in [tools.towncrier]. There must be something I misunderstand in towncrier... or it is bug, idk. Or perhaps the part of our toolchain that uses it in draft mode (where is that?) could generate the title?

Copy link
Member

Choose a reason for hiding this comment

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

Yea, well, I prefer that to a duplicated heading in the release docs. :)

Copy link
Member

Choose a reason for hiding this comment

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

@sbidoul this is probably a towncrier bug because the behavior changed with the latest release.

Copy link
Member

Choose a reason for hiding this comment

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

The Towncrier regression makes normal and draft runs produce different outputs: twisted/towncrier#105. Possible upstream fix: twisted/towncrier#303.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 29, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants