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

Write markers before hashes to fix issues. #763

Merged
merged 1 commit into from
Mar 11, 2019

Conversation

milind-shakya-sp
Copy link
Contributor

@milind-shakya-sp milind-shakya-sp commented Mar 11, 2019

Fixes issue with generated lock file when hashes and markers are used together.

Fixes #762

Changelog-friendly one-liner: Fix order issue with generated lock file when hashes and markers are used together.

Contributor checklist
  • Provided the tests for the changes.
  • Requested a review from another contributor.
  • Gave a clear one-line description in the PR (that the maintainers can add to CHANGELOG.md on release).
  • Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

@milind-shakya-sp milind-shakya-sp changed the title Write markers before hashes to fix issues. [WIP] Write markers before hashes to fix issues. Mar 11, 2019
@atugushev atugushev added this to the 3.5.0 milestone Mar 11, 2019
@milind-shakya-sp
Copy link
Contributor Author

@atugushev Please review when you get a chance.

Copy link
Member

@atugushev atugushev left a comment

Choose a reason for hiding this comment

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

Thank you for fixing the bug! Could you provide a test something like test_format_requirement_ireq_with_hashes_and_markers?

@codecov
Copy link

codecov bot commented Mar 11, 2019

Codecov Report

Merging #763 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #763   +/-   ##
=======================================
  Coverage   91.94%   91.94%           
=======================================
  Files          35       35           
  Lines        2296     2296           
  Branches      306      306           
=======================================
  Hits         2111     2111           
  Misses        153      153           
  Partials       32       32
Impacted Files Coverage Δ
piptools/utils.py 100% <100%> (ø) ⬆️

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 cb83ccf...09e62cf. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 11, 2019

Codecov Report

Merging #763 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #763      +/-   ##
==========================================
+ Coverage   91.94%   91.96%   +0.02%     
==========================================
  Files          35       35              
  Lines        2296     2302       +6     
  Branches      306      306              
==========================================
+ Hits         2111     2117       +6     
  Misses        153      153              
  Partials       32       32
Impacted Files Coverage Δ
piptools/utils.py 100% <100%> (ø) ⬆️
tests/test_utils.py 100% <100%> (ø) ⬆️

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 cb83ccf...09e62cf. Read the comment docs.

@milind-shakya-sp milind-shakya-sp changed the title [WIP] Write markers before hashes to fix issues. Write markers before hashes to fix issues. Mar 11, 2019
@milind-shakya-sp
Copy link
Contributor Author

@atugushev added test.

@atugushev
Copy link
Member

@milind-shakya-sp it looks good now. Could you please change the Changelog-friendly one-liner, because the issue number will be attached anyway.

@milind-shakya-sp
Copy link
Contributor Author

@atugushev updated.

@atugushev atugushev merged commit 604f4e4 into jazzband:master Mar 11, 2019
@atugushev
Copy link
Member

Thanks for the contribution!

@milind-shakya-sp milind-shakya-sp deleted the fix_output_marker_hash branch March 11, 2019 19:18
@milind-shakya-sp milind-shakya-sp restored the fix_output_marker_hash branch March 11, 2019 19:18
@atugushev
Copy link
Member

pip-tools v3.5.0 is released

@milind-shakya-sp milind-shakya-sp deleted the fix_output_marker_hash branch March 13, 2019 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants