Fixed #17

EpistasisLab · Nov 16, 2015 · 2fa8f3c · 2fa8f3c
1 parent 85f3a68
commit 2fa8f3c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,8 @@ TPOT is built on top of several existing Python libraries, including:
 
 * NumPy
 
+* SciPy
+
 * pandas
 
 * scikit-learn
@@ -32,19 +34,25 @@ TPOT is built on top of several existing Python libraries, including:
 
 Except for DEAP, all of the necessary Python packages can be installed via the [Anaconda Python distribution](https://www.continuum.io/downloads), which we strongly recommend that you use. We also strongly recommend that you use of Python 3 over Python 2 if you're given the choice.
 
+NumPy, SciPy, pandas, and scikit-learn can be installed in Anaconda via the command:
+
+```Shell
+conda install numpy scipy pandas scikit-learn
+```
+
 DEAP can be installed with `pip` via the command:
 
 ```Shell
 pip install deap
 ```
 
-**If you don't care about the details and just want to install TPOT, run the following command:**
+Finally to install TPOT, run the following command:
 
 ```Shell
 pip install tpot
 ```
 
-`pip` should be able to sort out all of the dependencies for you.
+Please [file a new issue](https://github.com/rhiever/tpot/issues/new) if you run into installation problems.
 
 ## Usage
 

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -2,19 +2,11 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
 
-
-def parse_requirements(filename):
-    return list(filter(lambda line: (line.strip())[0] != '#',
-                       [line.strip() for line in open(filename).readlines()]))
-
-
 def calculate_version():
     initpy = open('tpot/__init__.py').read().split('\n')
-    version = next(filter(lambda x: '__version__' in x, initpy)).split('\'')[1]
+    version = list(filter(lambda x: '__version__' in x, initpy))[0].split('\'')[1]
     return version
 
-
-requirements = parse_requirements('requirements.txt')
 package_version = calculate_version()
 
 setup(
@@ -41,7 +33,7 @@ def calculate_version():
 This project is hosted at https://github.com/rhiever/tpot
 ''',
     zip_safe=True,
-    install_requires=requirements,
+    install_requires=['numpy', 'scipy', 'pandas', 'scikit-learn', 'deap'],
     classifiers=[
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",

diff --git a/tpot/__init__.py b/tpot/__init__.py
@@ -19,4 +19,4 @@
 
 from .tpot import TPOT, main
 
-__version__ = '0.1.2'
+__version__ = '0.1.3'