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

gh-97731: fix distclean target to clean docs #97732

Merged
merged 1 commit into from
Oct 4, 2022

Conversation

smontanaro
Copy link
Contributor

@smontanaro smontanaro commented Oct 2, 2022

This change makes the distclean target in Makefile.pre.in rely on the clean target in Doc/Makefile to do that part of its job.

@smontanaro
Copy link
Contributor Author

I don't think a NEWS entry is required for this, but I don't see how to add a "skip news" label...

@hugovk
Copy link
Member

hugovk commented Oct 2, 2022

I added "skip news" by clicking Labels on the right, then filtering by typing in "skip":

image

@smontanaro
Copy link
Contributor Author

Thanks @hugovk. "Labels" is inactive for me. I don't know where type-bug came from either. I guess that was the default for a bug report?

@hugovk
Copy link
Member

hugovk commented Oct 3, 2022

Yes, type-bug is automatically added when using the bug template, defined here:

https://github.com/python/cpython/blob/main/.github/ISSUE_TEMPLATE/bug.md

@orsenthil
Copy link
Member

This change looks good to me. I will let the build, release managers comment as it can serve or affect their work.

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

Looks good, reduces duplication.

From the issue:

Doc/tools/{sphinx,pygments,docutils} doesn' exist after executing make -C Doc html. I suspect the docclean target could simply be replaced by make -C Doc clean, and made a dependency of the distclean target.

Those dirs look redundant now.

Deletion of those dirs from the top-level Makefile.pre.in added 15 years ago (8188e63).

Also 15 years ago, Doc/Makefile used to only delete Docs/tools/sphinx (116aa62).

But use of a venv was added 8 years ago (d5ea39d), so dependencies get wiped from the venv dir.

@orsenthil orsenthil added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 4, 2022
@orsenthil orsenthil merged commit 46eecc3 into python:main Oct 4, 2022
@miss-islington
Copy link
Contributor

Thanks @smontanaro for the PR, and @orsenthil for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @smontanaro and @orsenthil, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 46eecc3b33b960d7e692547dd61792533d213e01 3.11

@miss-islington
Copy link
Contributor

Sorry @smontanaro and @orsenthil, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 46eecc3b33b960d7e692547dd61792533d213e01 3.10

@orsenthil
Copy link
Member

orsenthil added a commit that referenced this pull request Oct 4, 2022
Backport  gh-97731: fix distclean target to clean docs #97732 to 3.11
orsenthil added a commit that referenced this pull request Oct 4, 2022
Backport  gh-97731: fix distclean target to clean docs #97732 to 3.10
@smontanaro smontanaro deleted the GH97731 branch October 6, 2022 18:38
@hauntsaninja hauntsaninja removed needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Dec 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants