Skip to content

Commit

Permalink
Fix name collision with the bundled sklearn
Browse files Browse the repository at this point in the history
  • Loading branch information
rth committed Dec 26, 2017
1 parent 20cc52d commit c1663ba
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions freediscovery/externals/joblib/__init__.py
@@ -0,0 +1 @@

File renamed without changes.
2 changes: 1 addition & 1 deletion freediscovery/tests/run_suite.py
Expand Up @@ -3,7 +3,7 @@
import os
import sys

from freediscovery.externals.joblib_pool import _get_temp_dir
from freediscovery.externals.joblib.pool import _get_temp_dir

base_dir = os.path.dirname(os.path.dirname(__file__))

Expand Down

0 comments on commit c1663ba

Please sign in to comment.