fix installation instructions

cosmicBboy · Jan 7, 2018 · 9099e27 · 9099e27
1 parent c0c392d
commit 9099e27
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -75,11 +75,18 @@ You can install the latest released version with `conda` or `pip`.
 
 ```
 # conda
-conda install themis-ml
+conda install -c cosmicbboy themis-ml
 ```
 
+If you install with pip, you'll need to install scikit-learn, numpy, and pandas
+with either pip or conda. Version requirements:
+
+- numpy (>= 1.9.0)
+- scikit-learn (>= 0.19.1)
+- pandas (>= 0.22.0)
+
 ```
-#pip
+# pip
 pip install themis-ml
 ```
 

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -49,7 +49,16 @@ Python 2.7 and 3.6 are supported.
 .. code-block:: python
 
     # conda
-    conda install themis-ml
+    conda install -c cosmicbboy themis-ml
+
+If you install with pip, you'll need to install scikit-learn, numpy, and pandas
+with either pip or conda. Version requirements:
+
+- numpy (>= 1.9.0)
+- scikit-learn (>= 0.19.1)
+- pandas (>= 0.22.0)
+
+.. code-block:: python
 
     # pip
     pip install themis-ml

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name="themis-ml",
@@ -26,9 +26,9 @@
     },
     include_package_data=True,
     install_requires=[
-        "numpy",
-        "pandas",
+        "scikit-learn >= 0.19.1",
+        "numpy >= 1.9.0",
+        "pandas >= 0.22.0",
         "pathlib2",
-        "scikit-learn"
         ]
     )