Merge richard #2211
Merged
Merge richard #2211
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
- We now use the `utf-8-sig` encoding in more places where we previously used `utf-8`. - Context managers are now used for opening files in all occurrences I discovered where that was not the case so far. - In places where the `rU` decoding was used we switched to `io.open(..., 'r')`, which is both supported in Python 2 and 3 (in fact, in Python 3, `open is io.open`). This allowed to achieve backward-compatible code with fewer redundancies in many places.
iohub tries to import msgpack-numpy and, if that import fails, emits a warning that this "may cause issues". Therefore, adding msgpack-numpy to the package requirements.
Imported modules at the beginning of the script were used to compile the experiment script. These modules were imported from the current version of PsychoPy, not the requested version. This fix imports modules after useVersion has been called, which fixes the problem. Also adds docstrings and refactors.
Since we're not actually installing Anaconda, but we're using `conda` from the Miniconda distribution. Also rename the environments accordingly.
# Conflicts: # psychopy/scripts/psyexpCompile.py
io.open has different args order to codecs.open also compile with JS should log a warning not raise an error
Codecov Report
@@ Coverage Diff @@
## master #2211 +/- ##
==========================================
+ Coverage 42.86% 42.88% +0.02%
==========================================
Files 221 221
Lines 38232 38225 -7
Branches 6574 6572 -2
==========================================
+ Hits 16387 16394 +7
+ Misses 20284 20268 -16
- Partials 1561 1563 +2
Continue to review full report at Codecov.
|
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.
Merged Richards changes to using utf-8-sig (and io instead of codecs) and David's fixes to useVersion compileScript