Merge branch 'master' into 3.6 #1758
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
…onLanguages#1732) * Performance improvements of reading and writing through StreamBox * Optimize StreamBox.ReadInto
* Add clocks * Disable test
* Fix issue with timestamp timezone * Add test
* Drop .NET Core 3.1 * Fix interop tests * Fix sqlite3 test * Try ubuntu-latest * Bump to ubuntu-latest * Update readme
# Conflicts: # Src/IronPython/Runtime/PythonList.cs
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.
This is an opportunistic merge: there were no conflicts but one, and that one was trivial to resolve ("take both").
A few tests are failing but when I managed to build the current head of 3.6, the tests on Windows were failing as well, so I'm not sure the failures are because of the merge (at least not all of them). Either way, something to be addressed in a separate PR.
I am submitting this merge to make 3.6 buildable again and because I am planning to make a change to master that should not land on 3.6. So to make it easier to isolate that commit.
Note: in order to maintain git commit parents, squash cannot be used for merging.