delta/python-setuptools-git.git, branch 11.1 github.com: pypa/setuptools.git Update changelog 2015-01-04T19:35:30+00:00 Jason R. Coombs jaraco@jaraco.com 2015-01-04T19:35:30+00:00 9974d0bd67352392328a3dda07699e80cc90596c 






Fix test failure on Python 2
2015-01-04T19:28:07+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T19:28:07+00:00

0b7d713f812e7d84f143bd84f0734ae77169bb68












Add test capturing expectation when dependencies conflict during resolve. Fixes #281
2015-01-04T19:24:22+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T19:24:22+00:00

cdb9797a1107afd4d7baf021b2af84946d349a2a












Normalize whitespace
2015-01-04T19:13:05+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T19:13:05+00:00

72e3a1ce5986c54fed71da1f65aed4022008511f












Only raise a ContextualVersionConflict when dependent requirements are present.
2015-01-04T18:58:33+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T18:58:33+00:00

0529be8ca5487513336da8fd35108c52aa95e582












No need to mutate the set to a list; just use the set.
2015-01-04T18:41:29+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T18:41:29+00:00

a7ae16215eab4487954d546f583e30869696adfc












Split out ContextualVersionConflict
2015-01-04T18:39:31+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T18:39:31+00:00

ddb012669aa26fffd6791283e6405fa34bf9f0e5












Test the report method
2015-01-04T18:25:28+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T18:25:28+00:00

23d5e4a81a61c5e6617fa69fd0b2bc440fa20c45












Add test for WorkingSet.find() when a conflict occurs.
2015-01-04T18:00:50+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T18:00:50+00:00

880ccea0220509bfaf483a50beefc128299a5b03












Remove unreachable branch
2015-01-04T17:44:16+00:00

Jason R. Coombs
jaraco@jaraco.com

2015-01-04T17:44:16+00:00

06b95e98f06916ccbd04b60e9d3866e3d6bf7ae2