Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
sort, for deterministic output
Browse files Browse the repository at this point in the history
  • Loading branch information
bukzor committed Jan 8, 2015
1 parent 3ae43cb commit 8173eee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/functional/conflict_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ def test_multiple_issues(tmpdir):
assert '''
Successfully installed mccabe pep8 setuptools
Cleaning up...
Error: unmet dependency: pyflakes>=0.8.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
Error: version conflict: mccabe 0.2 <-> mccabe>=0.2.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
Error: version conflict: pep8 1.0 <-> pep8>=1.5.7 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
Error: unmet dependency: pyflakes>=0.8.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
Something went wrong! Sending 'virtualenv_run' back in time, so make knows it's invalid.
''' in out
2 changes: 1 addition & 1 deletion venv_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def trace_requirements(requirements):

result.append(dist_to_req(dist))

for dist_req in dist.requires(): # should we support extras?
for dist_req in sorted(dist.requires(), key=lambda req: req.key):
# there really shouldn't be any circular dependencies...
queue.append(InstallRequirement(dist_req, str(req)))

Expand Down

0 comments on commit 8173eee

Please sign in to comment.