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

Fix warnings when files are overwritten in the build directory. #12627

Merged
merged 3 commits into from
Jul 20, 2024

Conversation

picnixz
Copy link
Member

@picnixz picnixz commented Jul 20, 2024

cc @AA-Turner

I fixed the test (it was due to the two files having the same file size, and filecmp.cmp() returned True because it did not checked the contents). I also added a message for the assertion since it helps in debugging the error location.

@AA-Turner
Copy link
Member

I don't want to have a new warning in a micro release, hence using info - please revert.

A

sphinx/util/osutil.py Outdated Show resolved Hide resolved
@picnixz
Copy link
Member Author

picnixz commented Jul 20, 2024

I don't want to have a new warning in a micro release, hence using info - please revert.

I updated the tests accordingly (since the message would no more be printed on the warnings stream).

@picnixz picnixz requested a review from AA-Turner July 20, 2024 13:02
@AA-Turner AA-Turner added this to the 7.4.x milestone Jul 20, 2024
sphinx/util/fileutil.py Outdated Show resolved Hide resolved
@AA-Turner AA-Turner merged commit 6c486a5 into sphinx-doc:master Jul 20, 2024
21 checks passed
@AA-Turner
Copy link
Member

Thanks!

A

@picnixz picnixz deleted the fix-html-copy-assets-override branch July 20, 2024 13:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants