Reorganize requirements files

.travis.yml

@@ -7,8 +7,8 @@ before_install:
   - sudo apt-get update
   - sudo xargs -a apt-packages.txt apt-get install --fix-missing
 install:
-  - pip install -r base_requirements.txt
   - sudo apt-get install python-matplotlib python-numpy python-scipy python-sklearn
-  - pip install nltk==2.0.3 scikit-learn==0.12.1
+  - pip install -r requirements.txt
+  - pip install -r dev-requirements.txt
   - sudo mv ease/data/nltk_data /usr/share/nltk_data
-script:  nosetests
+script:  nosetests
\ No newline at end of file

base_requirements.txt

-lxml==3.0.1
-mock==0.8.0
-nose==1.2.1
-path.py==3.0
-pylint==0.26.0
-pytz==2012h
-fisher==0.1.4

dev-requirements.txt

+coverage==3.5.3
+django-sphinx-autodoc
+mock==0.8.0
+nose==1.2.1
+pylint==0.26.0
+sphinx

requirements.txt

--r base_requirements.txt
-coverage==3.5.3
+lxml==3.0.1
+fisher==0.1.4
+nltk==2.0.3
+path.py==3.0
+pytz==2012h
 scipy==0.11.0
 scikit-learn==0.12.1
-sphinx
-django-sphinx-autodoc
-nltk==2.0.3

setup.py

 from setuptools import setup, find_packages
 
 
-def is_requirement(line):
-    """
-    Return True if the requirement line is a package requirement;
-    that is, it is not blank, a comment, or editable.
-    """
-    # Remove whitespace at the start/end of the line
-    line = line.strip()
-
-    # Skip blank lines, comments, and editable installs
-    return not (
-        line == '' or
-        line.startswith('-r') or
-        line.startswith('#') or
-        line.startswith('-e') or
-        line.startswith('git+')
-    )
-
-
-REQUIREMENTS = [
-    line.strip() for line in (
-        open("pre-requirements.txt").readlines() +
-        open("requirements.txt").readlines() +
-        open("base_requirements.txt").readlines()
-    )
-    if is_requirement(line)
-]
+REQUIREMENTS = [line.strip() for line in open("requirements.txt").readlines()]
+DEV_REQUIREMENTS = [line.strip() for line in open("dev-requirements.txt").readlines()]
 
 
 setup(
@@ -44,4 +20,5 @@ setup(
     url = "https://github.com/edx/ease",
     include_package_data = True,
     install_requires=REQUIREMENTS,
+    tests_require=DEV_REQUIREMENTS,
 )