Pull in latest from nerdvegas/master ... #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-PackageOrder WIP -NOTE solver solve_time currently misleading, need different way to calculate
-added some low-level configurable options to speed solves a little -implemented better load/solve time tracking
-package reorderers rxt save/load
-added context patching code in new file, standalone. NOTE: other code in rez not using this yet.
-added rez-gui --diff option -single context load now maximises the subwindow
…kdir -p functionality
-updated old pkg command conversion to fall back on bash on any error.
… rxt -changed patching behavior so that a non-conflict patch overrides all refs to that pkg, including !/~ -fixed bug in Requirement.__iter__ when requirement is a conflict
Will make it so that, if in the package.py you do "version.as_tuple() >= (5, 2)", we won't get an unexpected result if the version is 5.0. Will still be a (potential) problem if the version is "5.00" - but that's likely a less common case, and at least they now have to the option of using 5.0 if they want to ensure easy numeric comparision would eventually like to override > / < / == comparison to automatically convert the other side to a Version object if it's a string, and then compare using it's more sophisticated logic... but this is a quick fix for now
-added copyright/lic to each py file
Creating a single branch with all the Windows changes.
…hed shell being left in a blocked state waiting on user input.
added 19 commits
June 12, 2016 13:11
-added s option to res-selftest to limit to specific shell
other user (i.e. ‘~sclaus’), as this always might clash with weak pkg ref.
add_license.py helper now retains non-me copyright authors
files are unaffected.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update from nerdvegas/master, which has now incorporated our minimal_windows_fixes branch.