Merge pull request #71 from mje-nz/fix-dependencies

Specify dependencies correctly in setup.py (fix #70)

Author: josesho

.travis.yml

@@ -22,8 +22,7 @@ install:
   - conda config --add channels conda-forge
   - conda create -n testenv --yes pip python=$PYTHON matplotlib
   - source activate testenv
-  - pip install pytest==4.3
-  - pip install .
+  - pip install .[dev]
 
 
 script: pytest dabest

README.md

@@ -6,6 +6,7 @@
 [![Free-to-view citation](https://zenodo.org/badge/DOI/10.1038/s41592-019-0470-3.svg)](https://rdcu.be/bHhJ4)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause--Clear-orange.svg)](https://spdx.org/licenses/BSD-3-Clause-Clear.html)
 
+
 ## About
 
 DABEST is a package for **D**ata **A**nalysis using **B**ootstrap-Coupled **EST**imation.
@@ -22,21 +23,12 @@ An estimation plot has two key features.
 
 DABEST powers [estimationstats.com](https://www.estimationstats.com/), allowing everyone access to high-quality estimation plots.
 
-## Requirements
-
-DABEST has been tested on Python 3.5, 3.6, and 3.7.
-
-In addition, the following packages are also required:
-- [numpy](https://www.numpy.org) (1.15)
-- [scipy](https://www.scipy.org) (1.2)
-- [matplotlib](https://www.matplotlib.org) (3.0)
-- [seaborn](https://seaborn.pydata.org) (0.9)
-- [pandas](https://pandas.pydata.org) (0.24).
-
-To obtain these package dependencies easily, it is highly recommended to download the [Anaconda distribution](https://www.continuum.io/downloads) of Python.
 
 ## Installation
 
+This package is tested on Python 3.5, 3.6, and 3.7.
+It is highly recommended to download the [Anaconda distribution](https://www.continuum.io/downloads) of Python in order to obtain the dependencies easily.
+
 You can install this package via `pip`.
 
 To install, at the command line run
@@ -56,6 +48,7 @@ Then, navigate to the cloned repo in the command line and run
 pip install .
 ```
 
+
 ## Usage
 
 ```python3
@@ -99,6 +92,7 @@ All contributions are welcome; please read the [Guidelines for contributing](htt
 
 We also have a [Code of Conduct](https://github.com/ACCLAB/DABEST-python/blob/master/CODE_OF_CONDUCT.md) to foster an inclusive and productive space.
 
+
 ## Acknowledgements
 
 We would like to thank alpha testers from the [Claridge-Chang lab](https://www.claridgechang.net/): [Sangyu Xu](https://github.com/sangyu), [Xianyuan Zhang](https://github.com/XYZfar), [Farhan Mohammad](https://github.com/farhan8igib), Jurga Mituzaitė, and Stanislav Ott.

setup.py

@@ -27,62 +27,7 @@
 """
 
 
-# Modified from from setup.py in seaborn.
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-
-
-def need_to_install(module, version):
-    desired_major_version = int(version.split('.')[0])
-    desired_minor_version = int(version.split('.')[1])
-
-    INSTALLED_VERSION_MAJOR = int(module.__version__.split('.')[0])
-    INSTALLED_VERSION_MINOR = int(module.__version__.split('.')[1])
-
-    if INSTALLED_VERSION_MAJOR < desired_major_version:
-        return True
-
-    elif INSTALLED_VERSION_MAJOR == desired_major_version and \
-         INSTALLED_VERSION_MINOR < desired_minor_version:
-        return True
-
-    else:
-        return False
-
-
-
-def check_dependencies():
-    from importlib import import_module
-
-    modules = {'numpy'      : '1.15',
-               'scipy'      : '1.2',
-               'statsmodels': '0.9', 
-               'pandas'     : '0.24',
-               'matplotlib' : '3.0',
-               'seaborn'    : '0.9'}
-    to_install = []
-
-    for module, version in modules.items():
-        try:
-            my_module = import_module(module)
-
-            if need_to_install(my_module, version):
-                to_install.append("{}=={}".format(module, version))
-
-        except ImportError:
-            to_install.append("{}=={}".format(module, version))
-
-    return to_install
-
-
-
 if __name__ == "__main__":
-
-    installs = check_dependencies()
-
     setup(
         name='dabest',
         author='Joses W. Ho',
@@ -93,7 +38,16 @@ def check_dependencies():
         description=DESCRIPTION,
         long_description=LONG_DESCRIPTION,
         packages=find_packages(),
-        install_requires=installs,
+        install_requires=[
+            'numpy~=1.15',
+            'scipy~=1.2',
+            # 'statsmodels~=0.9',
+            'pandas<0.25',
+            'matplotlib~=3.0',
+            'seaborn~=0.9'
+        ],
+        extras_require={'dev': ['pytest==4.3']},
+        python_requires='>=3.5',
         url='https://acclab.github.io/DABEST-python-docs',
         download_url='https://www.github.com/ACCLAB/DABEST-python',
         license='BSD 3-clause Clear License'