Merge pull request #262 from openml/add/#259

bump version number, add check for OpenML connector

Author: mfeurer

openml/__init__.py

@@ -26,7 +26,7 @@
 from .tasks import OpenMLTask, OpenMLSplit
 from .flows import OpenMLFlow
 
-__version__ = "0.3.0"
+__version__ = "0.4.0dev"
 
 
 def populate_cache(task_ids=None, dataset_ids=None, flow_ids=None,

openml/flows/sklearn_converter.py

@@ -19,6 +19,7 @@
 # Necessary to have signature available in python 2.7
 from sklearn.utils.fixes import signature
 
+import openml
 from openml.flows import OpenMLFlow
 from openml.exceptions import PyOpenMLError
 
@@ -30,7 +31,7 @@
 
 
 DEPENDENCIES_PATTERN = re.compile(
-    '^(?P<name>[\w\-]+)((?P<operation>==|>=|>)(?P<version>(\d+\.)?(\d+\.)?(\d+)))?$')
+    '^(?P<name>[\w\-]+)((?P<operation>==|>=|>)(?P<version>(\d+\.)?(\d+\.)?(\d+)?(dev)?))?$')
 
 
 def sklearn_to_flow(o, parent_model=None):
@@ -235,8 +236,10 @@ def _get_external_version_string(model, sub_components):
     model_package_version_number = module.__version__
     external_version = _format_external_version(model_package_name,
                                                 model_package_version_number)
+    openml_version = _format_external_version('openml', openml.__version__)
     external_versions = set()
     external_versions.add(external_version)
+    external_versions.add(openml_version)
     for visitee in sub_components.values():
         for external_version in visitee.external_version.split(','):
             external_versions.add(external_version)

tests/test_flows/test_sklearn.py

@@ -3,6 +3,7 @@
 import os
 import sys
 import unittest
+import warnings
 
 if sys.version_info[0] >= 3:
     from unittest import mock
@@ -24,8 +25,8 @@
 import sklearn.preprocessing
 import sklearn.tree
 
+import openml
 from openml.flows import OpenMLFlow, sklearn_to_flow, flow_to_sklearn
-
 from openml.flows.functions import assert_flows_equal
 from openml.flows.sklearn_converter import _format_external_version, \
     _check_dependencies, _check_n_jobs
@@ -63,7 +64,8 @@ def test_serialize_model(self, check_dependencies_mock):
 
         fixture_name = 'sklearn.tree.tree.DecisionTreeClassifier'
         fixture_description = 'Automatically created scikit-learn flow.'
-        version_fixture = 'sklearn==%s\nnumpy>=1.6.1\nscipy>=0.9' % sklearn.__version__
+        version_fixture = 'sklearn==%s\nnumpy>=1.6.1\nscipy>=0.9' \
+                          % sklearn.__version__
         fixture_parameters = \
             OrderedDict((('class_weight', 'null'),
                          ('criterion', '"entropy"'),
@@ -520,11 +522,13 @@ def test_subflow_version_propagated(self):
         # I put the alternative travis-ci answer here as well. While it has a
         # different value, it is still correct as it is a propagation of the
         # subclasses' module name
-        self.assertEqual(flow.external_version, '%s,%s' % (
+        self.assertEqual(flow.external_version, '%s,%s,%s' % (
+            _format_external_version('openml', openml.__version__),
             _format_external_version('sklearn', sklearn.__version__),
             _format_external_version('tests', '0.1')))
 
-    def test_check_dependencies(self):
+    @mock.patch('warnings.warn')
+    def test_check_dependencies(self, warnings_mock):
         dependencies = ['sklearn==0.1', 'sklearn>=99.99.99', 'sklearn>99.99.99']
         for dependency in dependencies:
             self.assertRaises(ValueError, _check_dependencies, dependency)