Merge pull request #277 from openml/bump_version

[WIP] Bump version + better version handling

Author: mfeurer

openml/__init__.py

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

openml/__version__.py

@@ -0,0 +1,4 @@
+"""Version information."""
+
+# The following line *must* be the last in the module, exactly as formatted:
+__version__ = "0.5.0dev"

requirements.txt

@@ -1,7 +1,7 @@
 mock
 numpy>=1.6.2
 scipy>=0.13.3
-liac-arff>=2.1.1dev
+liac-arff>=2.1.1
 xmltodict
 nose
 requests

setup.py

@@ -2,6 +2,9 @@
 import setuptools
 import sys
 
+with open("openml/__version__.py") as fh:
+    version = fh.readlines()[-1].split()[-1].strip("\"'")
+
 
 requirements_file = os.path.join(os.path.dirname(__file__), 'requirements.txt')
 requirements = []
@@ -17,11 +20,6 @@
             url = '/'.join(split[:-1])
             requirement = split[-1]
             requirements.append(requirement)
-            # Add the rest of the URL to the dependency links to allow
-            # setup.py test to work
-            if 'git+https' in url:
-                dependency_links.append(line.replace('git+', ''))
-
 
 try:
     import numpy
@@ -44,7 +42,7 @@
                  description="Python API for OpenML",
                  license="GPLv3",
                  url="http://openml.org/",
-                 version="0.3.0",
+                 version=version,
                  packages=setuptools.find_packages(),
                  package_data={'': ['*.txt', '*.md']},
                  install_requires=requirements,
@@ -63,7 +61,4 @@
                               'Programming Language :: Python :: 3',
                               'Programming Language :: Python :: 3.4',
                               'Programming Language :: Python :: 3.5',
-                 ],
-                 dependency_links=[
-                     "http://github.com/mfeurer/liac-arff/archive/master.zip"
-                     "#egg=liac-arff-2.1.1dev"])
+                              'Programming Language :: Python :: 3.6'])