Skip to content

Conversation

tomMoral
Copy link
Contributor

Fixes for #684

@codecov
Copy link

codecov bot commented May 20, 2018

Codecov Report

Merging #685 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #685      +/-   ##
==========================================
- Coverage   95.13%   95.11%   -0.02%     
==========================================
  Files          39       39              
  Lines        5427     5427              
==========================================
- Hits         5163     5162       -1     
- Misses        264      265       +1
Impacted Files Coverage Δ
joblib/_parallel_backends.py 94.39% <0%> (-0.87%) ⬇️
joblib/test/test_parallel.py 96.14% <0%> (+0.17%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 902fb6b...0857b01. Read the comment docs.

@tomMoral tomMoral force-pushed the FIX_travis_sklearn branch from e24b7d7 to a9f8cdd Compare May 20, 2018 22:02
@@ -22,7 +22,7 @@ fi
if [[ "$SKLEARN_TESTS" == "true" ]]; then
# Install scikit-learn from conda, patch it to use this version of joblib
# and run the scikit-learn tests with pytest.
conda install --yes scikit-learn nose
conda install --yes scikit-learn==0.19.1 nose scipy==1.0.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment to explain the motivation for the version pinning.

@tomMoral tomMoral merged commit cd81f88 into joblib:master May 22, 2018
@tomMoral tomMoral deleted the FIX_travis_sklearn branch May 22, 2018 14:41
yarikoptic added a commit to yarikoptic/joblib that referenced this pull request Jul 28, 2018
* tag '0.12': (116 commits)
  Release 0.12
  typo
  typo
  typo
  ENH add initializer limiting n_threads for C-libs (joblib#701)
  DOC better parallel docstring (joblib#704)
  [MRG] Nested parallel call thread bomb mitigation (joblib#700)
  MTN vendor loky2.1.3 (joblib#699)
  Make it possible to configure the reusable executor workers timeout (joblib#698)
  MAINT increase timeouts to make test more robust on travis
  DOC: use the .joblib extension instead of .pkl (joblib#697)
  [MRG] Fix exception handling in nested parallel calls (joblib#696)
  Fix skip test lz4 not installed (joblib#695)
  [MRG] numpy_pickle:  several enhancements (joblib#626)
  Introduce Parallel.__call__ backend callbacks (joblib#689)
  Add distributed on readthedocs (joblib#686)
  Support registration of external backends (joblib#655)
  [MRG] Add a dask.distributed example (joblib#613)
  ENH use cloudpickle to pickle interactively defined callable (joblib#677)
  CI freeze the version of sklearn0.19.1 and scipy1.0.1 (joblib#685)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants