Resolver.constraints: Keep our_constraints before their_constraints

[andersk]

Not sure if this is the right solution, but this seems to fix #851, which was introduced when the source_ireqs.sort(key=str) operation was added in #837.

Cc: @jakevdp

Changelog-friendly one-liner: Try to fix resolution of requirements from Git URLs without -e.

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).

[andersk]

Added a test case.

[codecov]

Codecov Report

Merging #879 into master will decrease coverage by 0.21%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #879      +/-   ##
==========================================
- Coverage   99.05%   98.84%   -0.22%     
==========================================
  Files          35       35              
  Lines        2231     2159      -72     
  Branches      285      285              
==========================================
- Hits         2210     2134      -76     
- Misses         13       15       +2     
- Partials        8       10       +2

Impacted Files	Coverage Δ
piptools/resolver.py	100% <100%> (ø)	⬆️
tests/test_resolver.py	100% <100%> (ø)	⬆️
tests/conftest.py	97.36% <100%> (-0.34%)	⬇️
piptools/repositories/pypi.py	92.55% <0%> (-2.27%)	⬇️
piptools/repositories/local.py	91.11% <0%> (-0.89%)	⬇️
piptools/scripts/sync.py	100% <0%> (ø)	⬆️
tests/test_writer.py	100% <0%> (ø)	⬆️
piptools/cache.py	100% <0%> (ø)	⬆️
tests/test_cli_compile.py	100% <0%> (ø)	⬆️
... and 12 more

---

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 4bfa887...25d7aa4. Read the comment docs.

[codecov]

Codecov Report

Merging #879 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #879      +/-   ##
==========================================
- Coverage   99.05%   99.05%   -0.01%     
==========================================
  Files          35       35              
  Lines        2231     2230       -1     
  Branches      285      285              
==========================================
- Hits         2210     2209       -1     
  Misses         13       13              
  Partials        8        8

Impacted Files	Coverage Δ
piptools/resolver.py	100% <100%> (ø)	⬆️
tests/test_resolver.py	100% <100%> (ø)	⬆️
tests/conftest.py	97.7% <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 4bfa887...25d7aa4. Read the comment docs.

[atugushev]

@andersk thank you! Much appreciated 👍 Let's wait for codecov report then and merge this if coverage is okay.

[andersk]

Cool—are we waiting for something other than the report posted above?

[atugushev]

Cool—are we waiting for something other than the report posted above?

There is a lack of two checks from codecov: coverage for the patch and the project. Codecov is glitching. Let's close and reopen issue.

[atugushev]

Coverage is fine 👍

[atugushev]

pip-tools v4.1.0 is released.