cleanup requirements

requirements.txt

@@ -1,3 +1,3 @@
 # This file is here because many Platforms as a Service look for
 #	requirements.txt in the root directory of a project.
--r requirements/production.txt
+-r requirements/aws.txt

requirements/aws.txt

@@ -1,2 +1,5 @@
 -r base.txt
-uwsgi==2.0.15
+django-ses==0.4.1
+django-sslify==0.2
+
+uWSGI==2.0.15

requirements/base.txt

@@ -1,43 +1,39 @@
 # Django
-Django==1.9.5
-
-# Forms
-django_compressor==2.0
-django-extensions==1.6.1
-django-redis-cache==1.6.5
-django-ses==0.4.1
-django-sslify==0.2
-
-# For the persistence stores
-psycopg2==2.6.1
-
-# Unicode slugification
+django==1.9.5
+dj-database-url==0.2.1
 django-autoslug==1.9.3
+django-storages==1.4
+django-pgjson==0.3.1
+modeltranslation==0.25
 
-# Time zones support
-pytz==2012h
+# Persistence stores
+psycopg2==2.6.1
 
 # background process management
+boto==2.39.0
 celery==3.1.20
-redis==2.10.5
-flower==0.8.4
+django-redis-cache==1.6.5
+django_compressor==2.0
+django-extensions==1.6.1
 kombu==3.0.32
+redis==2.10.5
 
-# Custom
-boto==2.39.0
-dj-database-url==0.2.1
+# Time zones support
+pytz==2012h
+
+# API
 djangorestframework==3.3.3
 django-rest-swagger==0.3.8
-django-pgjson==0.3.1
-django-storages==1.4
+
+# Various packages
 -e git+https://github.com/revsys/django-tos.git#egg=django_tos-master
 jellyfish==0.3.2
-python-dateutil>=2.4
+python-dateutil==2.6.0
 raven==5.9.0
 street-address==0.3.0
-unicodecsv==0.9.4
-usaddress==0.5.10
-xlrd==0.9.4
+unidecode==0.04.19
 xlwt==0.7.5
+xlrd==0.9.4
 xmltodict==0.9.0
-unidecode==0.04.19
+usaddress==0.5.10
+unicodecsv==0.9.4

requirements/local.txt

@@ -3,6 +3,12 @@
 django-debug-toolbar==1.4
 
 # required for migration scripts (for new data model) at the moment
-numpy
+IPython
 scipy
-ipython
+numpy
+
+# removed, but may be needed later
+#python-Levenshtein==0.12.0
+#pytest==3.0.4
+#pytest-django==3.0.0
+#unittest2==1.1.0

requirements/test.txt

@@ -1,36 +1,29 @@
 # Test dependencies go here. The local and test are the same at the moment.
 -r base.txt
+
+# general
+autopep8==1.3.2
 coverage==4.2
+coveralls==1.1
+tox==2.7.0
+
+# python testing
 django-nose==1.4.4
 Faker==0.7.7
-flake8==3.0.2
 mock==2.0.0
-nose==1.3.7
 nose-exclude==0.4.1
-pytest==3.0.4
-pytest-django==3.0.0
 requests==2.10.0
-selenium==2.53.6
-tox==2.7.0
-unittest2==1.1.0
-coveralls
 
+# static code analysis
+flake8==3.0.2
 
-# For documentation, spelling, and code checking
-Babel==2.3.4
-docutils==0.12
-pep8==1.7.0
-Jinja2==2.8
-MarkupSafe==0.23
-pyenchant==1.6.8
-python-Levenshtein==0.12.0
-snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinx_rtd_theme==0.2.5b1
+# functional tests
+#selenium==2.53.6
 
-# Ignore the spelling for now, six won't install correctly.
+# documentation and spelling
+Sphinx==1.6.2
 sphinxcontrib-spelling==2.3.0
-# six
+sphinx_rtd_theme==0.2.5b1
 
 # For running the server
 uWSGI==2.0.15