Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
clone_folder: C:\\projects\\openml-python

environment:
global:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\scikit-learn-contrib\\run_with_env.cmd"
# global:
# CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\scikit-learn-contrib\\run_with_env.cmd"

matrix:
- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"
MINICONDA: "C:\\Miniconda35-x64"

- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "32"
MINICONDA: "C:\\Miniconda35"

matrix:
fast_finish: true
Expand All @@ -36,12 +32,14 @@ install:
# XXX: setuptools>23 is currently broken on Win+py3 with numpy
# (https://github.com/pypa/setuptools/issues/728)
- conda update --all --yes setuptools=23
- conda install --yes nb_conda nb_conda_kernels

# Install the build and runtime dependencies of the project.
- "cd C:\\projects\\openml-python"
- conda install --quiet --yes mock numpy scipy nose requests scikit-learn nbformat python-dateutil nbconvert
- conda install --quiet --yes scikit-learn=0.18.2
- conda install --quiet --yes mock numpy scipy nose requests nbformat python-dateutil nbconvert pandas matplotlib seaborn
- pip install liac-arff xmltodict oslo.concurrency
- "%CMD_IN_ENV% python setup.py install"
- "python setup.py install" #%CMD_IN_ENV%


# Not a .NET project, we build scikit-learn in the install step instead
Expand Down
2 changes: 1 addition & 1 deletion openml/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def setUp(self):

# If we're on travis, we save the api key in the config file to allow
# the notebook tests to read them.
if os.environ.get('TRAVIS'):
if os.environ.get('TRAVIS') or os.environ.get('APPVEYOR'):
with lockutils.external_lock('config', lock_path=self.workdir):
with open(openml.config.config_file, 'w') as fh:
fh.write('apikey = %s' % openml.config.apikey)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_flows/test_sklearn.py
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ def test_error_on_adding_component_multiple_times_to_flow(self):
" n_components=None, random_state=None,\n" \
" svd_solver='auto', tol=0.0, whiten=False\)\), " \
"\('fs', SelectKBest\(k=10, score_func=<function " \
"f_classif at 0x[a-z0-9]+>\)\)\),\n" \
"f_classif at 0x[a-fA-F0-9]+>\)\)\),\n" \
" transformer_weights=None\)\), \('pca2', " \
"PCA\(copy=True, iterated_power='auto'," \
" n_components=None, random_state=None,\n" \
Expand Down
7 changes: 6 additions & 1 deletion tests/test_runs/test_run_functions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import arff
import collections
import json
import os
import random
import time
import sys
Expand Down Expand Up @@ -240,7 +241,11 @@ def _check_sample_evaluations(self, sample_evaluations, num_repeats, num_folds,
for sample in range(num_sample_entrees):
evaluation = sample_evaluations[measure][rep][fold][sample]
self.assertIsInstance(evaluation, float)
self.assertGreater(evaluation, 0) # should take at least one millisecond (?)
if not os.environ.get('CI_WINDOWS'):
# Either Appveyor is much faster than Travis
# and/or measurements are not as accurate.
# Either way, windows seems to get an eval-time of 0 sometimes.
self.assertGreater(evaluation, 0)
self.assertLess(evaluation, max_time_allowed)

def test_run_regression_on_classif_task(self):
Expand Down