Skip to content

Commit

Permalink
Python: fix deprecated joblib (#2068)
Browse files Browse the repository at this point in the history
* Import modules in init and fix deprecated joblib

* revert init chanage

* Update build-linux.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update build-linux.yml

* Update build-linux.yml
  • Loading branch information
jackgerrits committed Oct 26, 2019
1 parent 48a9d36 commit efc4982
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .pipelines/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pool:
vmImage: 'ubuntu-16.04'

container:
image: vowpalwabbit/ubuntu1604-build:0.1.0
image: vowpalwabbit/ubuntu1604-build:0.3.0
endpoint: DockerHub

steps:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ services:
- docker

before_install:
- docker pull vowpalwabbit/ubuntu1404-build:0.1.0
- docker pull vowpalwabbit/ubuntu1404-build:0.1.1
script:
- docker run -a STDOUT -v `pwd`:/vw -t vowpalwabbit/ubuntu1404-build:0.1.0 /bin/bash -c "cd /vw && chmod +x ./build-linux.sh && ./build-linux.sh"
- docker run -a STDOUT -v `pwd`:/vw -t vowpalwabbit/ubuntu1404-build:0.1.1 /bin/bash -c "cd /vw && chmod +x ./build-linux.sh && ./build-linux.sh"

after_success:
- docker run -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -a STDOUT -v `pwd`:/vw -t vowpalwabbit/ubuntu1404-build:0.1.0 /bin/bash -c "cd /vw && coveralls --include explore --include vowpalwabbit --gcov-options '\-lp'"
- docker run -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -a STDOUT -v `pwd`:/vw -t vowpalwabbit/ubuntu1404-build:0.1.1 /bin/bash -c "cd /vw && coveralls --include explore --include vowpalwabbit --gcov-options '\-lp'"
2 changes: 1 addition & 1 deletion python/vowpalwabbit/sklearn_vw.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from sklearn.datasets.svmlight_format import dump_svmlight_file
from sklearn.utils.validation import check_is_fitted
from sklearn.utils import shuffle
from sklearn.externals import joblib
import joblib
from vowpalwabbit import pyvw


Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
numpy>=1.6.1
scipy>=0.9
scikit-learn>=0.17
joblib>=0.10.3

0 comments on commit efc4982

Please sign in to comment.