Merge back v1.11.x #2236
Merged
Merge back v1.11.x #2236
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
* move stock arrays to test data
imagehash via conda
assertCmlApproxData tests statistics instead of full arrays
limit filelock use
Prevent dot_path tests from corrupting the stored path.
Dot test import
* Fix filelock bug.
Unpin miniconda to latest
Move to https
summary with stash
* Tolerance regrid within_bounds
|
Merges back from release branches shouldn't need rebasing... |
|
@marqh Is using a branch cut from |
|
Yes, that only requires a fast-forward merge. |
* Use v3.1 imagehash.hex_to_hash * Reduce nose process timeout.
|
i have pulled in recent changes from v1.11.x please ensure that this is included with all teh commit, if appropriate do not 'squash and merge' |
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.
return v1.11.x changes to master