Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest master from upstream #7

Merged
merged 68 commits into from Feb 6, 2016
Merged

Conversation

pombredanne
Copy link
Owner

No description provided.

lesteve and others added 30 commits November 16, 2015 14:55
Also added assert_raises_regex in joblib.testing
inspect.getargspec returns a named tuple already in Python 2.6
Use f4 arrays to avoid hashes difference between 32bit and 64bit on Linux.
Hashes were recomputed using 0.9.3
It is already tested in test_hashes_stay_the_same
to ensure that running the test from another path does not change the hash.
The reason that the hash changes is that the fully qualified name of MyClass
can vary depending on test_hashing.py path.
[MRG] Make joblib.Parallel more robust to custom exceptions
…ors-during-hash

[MRG] Do not swallow PicklingError during hash
…sions

since the test pickles can be generated on one architecture and the
tests run on another one. Also amended expected_list in
test_compressed_pickle_dump_and_load for consistency.
Move test into separate function and use repr in format
for better error message
[MRG+1] Avoid use of sys.version for version checks
[MRG+1] Fix typo in __init__.py
…-defined-functions

[MRG+1] Add test for Parallel with interactively defined function
Add test and entry in CHANGES.rst
lesteve and others added 27 commits January 13, 2016 16:16
rather than comparison with sys.version_info[0]
FIX: fixing hashing with mixed dtype + test
…able-exceptions

[MRG+1] Fix my_exceptions._mk_exception when input exception is not inheritable
DOC Fix redundant word in docstring
[MRG] add flake8 linting of diffs in Travis
@pombredanne
Copy link
Owner Author

@GaelVaroquaux @lesteve @ogrisel and team: Thanks!

pombredanne added a commit that referenced this pull request Feb 6, 2016
Latest master from upstream
@pombredanne pombredanne merged commit 27b2d21 into pombredanne:master Feb 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
8 participants