Skip to content

Commit

Permalink
Merge 3249485 into 2bc0acf
Browse files Browse the repository at this point in the history
  • Loading branch information
dnouri committed Oct 25, 2018
2 parents 2bc0acf + 3249485 commit 967e5c4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
language: python
python:
- "3.5"
- "3.6"
matrix:
include:
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial
sudo: true
env:
- TRAVIS=yes
before_install:
Expand Down
4 changes: 2 additions & 2 deletions palladium/tests/test_fit.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,12 @@ def estimator(self):

@pytest.mark.parametrize('backend', ['threading', 'sequential'])
def test_it(self, with_parallel_backend, estimator, backend):
X, y = np.random.random((10, 10)), np.random.randint(0, 2, 10)
X, y = np.random.random((100, 10)), np.random.randint(0, 2, 100)
with_parallel_backend(estimator, backend).fit(X, y)
with_parallel_backend(estimator, backend).predict(X)

def test_bad(self, with_parallel_backend, estimator):
X, y = np.random.random((10, 10)), np.random.randint(0, 2, 10)
X, y = np.random.random((100, 10)), np.random.randint(0, 2, 100)
with pytest.raises(KeyError):
with_parallel_backend(estimator, 'foo').fit(X, y)

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ numpy==1.14.2
pandas==0.22.0
psutil==5.4.5
python-dateutil==2.7.2
pytz==2018.4
requests==2.18.4
pytz==2018.5
requests==2.19.1
scikit-learn==0.19.1
scipy==1.0.1
six==1.11.0
Expand Down

0 comments on commit 967e5c4

Please sign in to comment.