From babf490bd98b465b08996b16da46b9f1455c5fd8 Mon Sep 17 00:00:00 2001 From: Nils Date: Thu, 21 Feb 2019 14:42:56 +0100 Subject: [PATCH] Finally fix installation of photon requirements --- photonai/__init__.py | 3 ++- setup.py | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/photonai/__init__.py b/photonai/__init__.py index 9d35994f..15152fa9 100644 --- a/photonai/__init__.py +++ b/photonai/__init__.py @@ -23,7 +23,8 @@ from . import configuration from .configuration.Register import PhotonRegister -__version__ = "0.4.0" +from ..setup import __version__ + __all__ = ("base", diff --git a/setup.py b/setup.py index 47a13811..363be11c 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,23 @@ -from distutils.core import setup -from setuptools import find_packages -import photonai +try: + from setuptools import setup, find_packages +except ImportError: + from ez_setup import use_setuptools + use_setuptools() + from setuptools import setup, find_packages + + +__version__ = '0.4.0' setup( name='photonai', packages=find_packages(), include_package_data=True, - version=photonai.__version__, + version=__version__, description='A Python-Based Hyperparameter optimization Toolbox for Neural Networks', author='PHOTON Team', author_email='hahnt@wwu.de', url='https://github.com/photonai-team/photonai.git', - download_url='https://github.com/photonai-team/photonai/archive/' + photonai.__version__ + '.tar.gz', + download_url='https://github.com/photonai-team/photonai/archive/' + __version__ + '.tar.gz', keywords=['machine learning', 'deep learning', 'neural networks', 'hyperparameter'], classifiers=[], install_requires=[