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

Sort .hhp file list #4838

Merged
merged 1 commit into from
Apr 15, 2018
Merged

Sort .hhp file list #4838

merged 1 commit into from
Apr 15, 2018

Conversation

bmwiedemann
Copy link
Contributor

@bmwiedemann bmwiedemann commented Apr 14, 2018

Without this change, the pgadmin3 openSUSE package differed for every build
(happens in a disposable VM) because pgadmin3.hhp contained entries
in indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this matters.

https://github.com/bmwiedemann/theunreproduciblepackage/tree/master/readdir also has some details on this topic.

@tk0miya
Copy link
Member

tk0miya commented Apr 14, 2018

+1; reasonable.

It seems this only changes the output of .hhp file. I think it is stable change. How about rebasing this to 1.7 branch?
Then you can use this on next stable release: 1.7.2.

Note: The error on Travis CI was related with new mypy release. I'm trying to fix it in #4839. So it will be fixed soon.

@tk0miya tk0miya added this to the 1.7.3 milestone Apr 14, 2018
Without this change, the pgadmin3 openSUSE package differed for every build
(happens in a disposable VM) because pgadmin3.hhp contained entries
in indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this matters.
@codecov
Copy link

codecov bot commented Apr 14, 2018

Codecov Report

Merging #4838 into 1.7 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##              1.7    #4838      +/-   ##
==========================================
+ Coverage   81.88%   81.88%   +<.01%     
==========================================
  Files         280      280              
  Lines       37463    37465       +2     
  Branches     5822     5822              
==========================================
+ Hits        30678    30680       +2     
  Misses       5482     5482              
  Partials     1303     1303
Impacted Files Coverage Δ
sphinx/builders/htmlhelp.py 96.21% <100%> (+0.05%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aa21d78...36038f8. Read the comment docs.

@bmwiedemann bmwiedemann changed the base branch from master to 1.7 April 14, 2018 19:28
@bmwiedemann
Copy link
Contributor Author

rebased it to 1.7 branch

@tk0miya tk0miya merged commit 4a3b4a9 into sphinx-doc:1.7 Apr 15, 2018
@tk0miya
Copy link
Member

tk0miya commented Apr 15, 2018

Merged.
Thank you for your contribution!

tk0miya added a commit that referenced this pull request Apr 15, 2018
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants