Merge pull request #1330 from Improve setup.py and dependency management

Improve setup.py and dependency management

requirements/base.in

@@ -1,102 +1,10 @@
-Django
-django-guardian
+# load from setup.py
+-e .
+
+# installed from Git
 -e git+https://github.com/bfirsh/django-ordered-model.git@master#egg=django-ordered-model
 -e git+https://github.com/onaio/[email protected]#egg=django-multidb-router
-django-registration-redux
-django-templated-email
-django-reversion
-django-filter
-
-# generic relation
-django-query-builder
-
-celery
-django-celery
-librabbitmq
-
-# cors
-django-cors-headers
-django-debug-toolbar
-
-python-digest
 -e git+https://github.com/onaio/[email protected]#egg=django-digest
-
-# oauth2 support
-django-oauth-toolkit
-oauth2client
-jsonpickle
-
-# jwt
-PyJWT
-
-# captcha
-recaptcha-client
-
-# API support
-djangorestframework
-djangorestframework-csv
-djangorestframework-gis
-djangorestframework-jsonapi
-djangorestframework-jsonp
-djangorestframework-xml
-
-geojson
-
-# tagging
-django-taggit
-
-# database
-psycopg2>2.7.1
-pymongo
-
-# sms support
-dict2xml
-lxml
-
-pyxform
-#pyfloip>=0.0.1
 -e git+https://github.com/onaio/floip-py.git@master#egg=floip
-
-# spss
-#-e git+https://bitbucket.org/fomcl/[email protected]#egg=savreaderwriter
-savreaderwriter
-
-unicodecsv
-xlrd
-xlwt
-openpyxl
 -e git+https://github.com/onaio/python-json2xlsclient.git#egg=python-json2xlsclient
-
-# tests
-mock
-httmock
--e git+https://github.com/jbalogh/django-nose.git#egg=django-nose
-
-# JSON data type support, keeping it around for previous migration
-jsonfield<1.0
-
-# memcached support
-pylibmc
-python-memcached
-
-# docs
-sphinx
-Markdown
-
-dpath
-elaphe
-httplib2
-modilabs-python-utils
-numpy
-Pillow
-python-dateutil
-pytz
-requests
-simplejson
-google-api-python-client
-uwsgi
-flake8
-raven
-
-django-activity-stream
-paho-mqtt
+-e git+https://github.com/jbalogh/django-nose.git#egg=django-nose

requirements/base.pip

@@ -17,7 +17,7 @@ argparse==1.4.0           # via unittest2
 babel==2.4.0              # via sphinx
 billiard==3.3.0.23        # via celery
 cchardet==1.1.3           # via datapackage, tabulator
-celery==3.1.25
+celery==3.1.25            # via django-celery
 certifi==2017.4.17        # via requests
 chardet==3.0.3            # via requests
 click==6.7                # via datapackage, tableschema, tabulator
@@ -40,13 +40,13 @@ django-render-block==0.5  # via django-templated-email
 django-reversion==2.0.8
 django-taggit==0.22.1
 django-templated-email==2.2.0
-django==1.11.11
+django==1.11.11           # via django-celery, django-debug-toolbar, django-oauth-toolkit, django-query-builder, django-render-block, django-reversion, djangorestframework-jsonapi, jsonfield
 djangorestframework-csv==2.0.0
 djangorestframework-gis==0.11.2
 djangorestframework-jsonapi==2.4.0
 djangorestframework-jsonp==1.0.2
 djangorestframework-xml==1.3.0
-djangorestframework==3.6.3
+djangorestframework==3.6.3  # via djangorestframework-csv, djangorestframework-gis, djangorestframework-jsonapi
 docutils==0.13.1          # via sphinx
 dpath==1.4.0
 elaphe==0.6.0
@@ -57,10 +57,11 @@ fleming==0.4.5            # via django-query-builder
 formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via mock
 functools32==3.2.3.post2  # via jsonschema
+future==0.16.0
 geojson==1.3.5
 google-api-python-client==1.6.2
 httmock==1.2.6
-httplib2==0.10.3
+httplib2==0.10.3          # via google-api-python-client, oauth2client
 idna==2.5                 # via requests
 ijson==2.3                # via tabulator
 imagesize==0.7.1          # via sphinx
@@ -85,13 +86,13 @@ mock==2.0.0
 modilabs-python-utils==0.1.5
 nose==1.3.7
 numpy==1.12.1
-oauth2client==4.1.0
+oauth2client==4.1.0       # via google-api-python-client
 oauthlib==2.0.1           # via django-oauth-toolkit
 olefile==0.44             # via pillow
-openpyxl==2.4.8
+openpyxl==2.4.8           # via tabulator
 paho-mqtt==1.3.1
 pbr==3.0.1                # via mock
-pillow==4.1.1
+pillow==4.1.1             # via elaphe
 psycopg2==2.7.3.1
 pyasn1-modules==0.0.8     # via oauth2client
 pyasn1==0.2.3             # via oauth2client, pyasn1-modules, rsa
@@ -101,14 +102,14 @@ pygments==2.2.0           # via sphinx
 pyjwt==1.5.0
 pylibmc==1.5.2
 pymongo==3.4.0
-python-dateutil==2.6.0
+python-dateutil==2.6.0    # via fleming, tableschema
 python-digest==1.7
 python-memcached==1.58
-pytz==2017.2
+pytz==2017.2              # via babel, celery, django, django-query-builder, fleming
 pyxform==0.10.0
 raven==6.1.0
 recaptcha-client==1.0.6
-requests==2.17.3
+requests==2.17.3          # via datapackage, httmock, sphinx, tableschema, tabulator
 rfc3986==1.1.0            # via tableschema
 rsa==3.4.2                # via oauth2client
 savreaderwriter==3.4.2
@@ -123,10 +124,10 @@ tableschema==1.0.8        # via datapackage
 tabulator==1.11.1         # via datapackage, tableschema
 traceback2==1.4.0         # via unittest2
 typing==3.6.1             # via sphinx
-unicodecsv==0.14.1
+unicodecsv==0.14.1        # via datapackage, djangorestframework-csv, pyxform, tableschema, tabulator
 unittest2==1.1.0          # via pyxform
 uritemplate==3.0.0        # via google-api-python-client
 urllib3==1.21.1           # via requests
 uwsgi==2.0.15
-xlrd==1.1.0
+xlrd==1.1.0               # via pyxform, tabulator
 xlwt==1.2.0

requirements/dev.pip

@@ -20,7 +20,7 @@ backports.functools-lru-cache==1.4  # via astroid, pylint
 backports.shutil-get-terminal-size==1.0.0  # via ipython
 billiard==3.3.0.23        # via celery
 cchardet==1.1.3           # via datapackage, tabulator
-celery==3.1.25
+celery==3.1.25            # via django-celery
 certifi==2017.4.17        # via requests
 chardet==3.0.3            # via requests
 click==6.7                # via datapackage, tableschema, tabulator
@@ -45,13 +45,13 @@ django-render-block==0.5  # via django-templated-email
 django-reversion==2.0.8
 django-taggit==0.22.1
 django-templated-email==2.2.0
-django==1.11.11
+django==1.11.11           # via django-celery, django-debug-toolbar, django-oauth-toolkit, django-query-builder, django-render-block, django-reversion, djangorestframework-jsonapi, jsonfield
 djangorestframework-csv==2.0.0
 djangorestframework-gis==0.11.2
 djangorestframework-jsonapi==2.4.0
 djangorestframework-jsonp==1.0.2
 djangorestframework-xml==1.3.0
-djangorestframework==3.6.3
+djangorestframework==3.6.3  # via djangorestframework-csv, djangorestframework-gis, djangorestframework-jsonapi
 docutils==0.13.1          # via sphinx
 dpath==1.4.0
 elaphe==0.6.0
@@ -62,10 +62,11 @@ fleming==0.4.5            # via django-query-builder
 formencode==1.3.1         # via pyxform
 funcsigs==1.0.2           # via mock
 functools32==3.2.3.post2  # via jsonschema
+future==0.16.0
 geojson==1.3.5
 google-api-python-client==1.6.2
 httmock==1.2.6
-httplib2==0.10.3
+httplib2==0.10.3          # via google-api-python-client, oauth2client
 idna==2.5                 # via requests
 ijson==2.3                # via tabulator
 imagesize==0.7.1          # via sphinx
@@ -95,16 +96,16 @@ mock==2.0.0
 modilabs-python-utils==0.1.5
 nose==1.3.7
 numpy==1.12.1
-oauth2client==4.1.0
+oauth2client==4.1.0       # via google-api-python-client
 oauthlib==2.0.1           # via django-oauth-toolkit
 olefile==0.44             # via pillow
-openpyxl==2.4.8
+openpyxl==2.4.8           # via tabulator
 paho-mqtt==1.3.1
 pathlib2==2.3.0           # via ipython, pickleshare
 pbr==3.0.1                # via mock
 pexpect==4.2.1            # via ipython
 pickleshare==0.7.4        # via ipython
-pillow==4.1.1
+pillow==4.1.1             # via elaphe
 prompt-toolkit==1.0.14    # via ipython
 psycopg2==2.7.3.1
 ptyprocess==0.5.2         # via pexpect
@@ -120,14 +121,14 @@ pylint-django==0.7.2
 pylint-plugin-utils==0.2.6  # via pylint-celery, pylint-django
 pylint==1.7.2
 pymongo==3.4.0
-python-dateutil==2.6.0
+python-dateutil==2.6.0    # via fleming, tableschema
 python-digest==1.7
 python-memcached==1.58
-pytz==2017.2
+pytz==2017.2              # via babel, celery, django, django-query-builder, fleming
 pyxform==0.10.0
 raven==6.1.0
 recaptcha-client==1.0.6
-requests==2.17.3
+requests==2.17.3          # via datapackage, httmock, sphinx, tableschema, tabulator
 rfc3986==1.1.0            # via tableschema
 rsa==3.4.2                # via oauth2client
 savreaderwriter==3.4.2
@@ -146,13 +147,13 @@ tabulator==1.11.1         # via datapackage, tableschema
 traceback2==1.4.0         # via unittest2
 traitlets==4.3.2          # via ipython
 typing==3.6.1             # via sphinx
-unicodecsv==0.14.1
+unicodecsv==0.14.1        # via datapackage, djangorestframework-csv, pyxform, tableschema, tabulator
 unittest2==1.1.0          # via pyxform
 uritemplate==3.0.0        # via google-api-python-client
 urllib3==1.21.1           # via requests
 uwsgi==2.0.15
 wcwidth==0.1.7            # via prompt-toolkit
 wrapt==1.10.10            # via astroid
-xlrd==1.1.0
+xlrd==1.1.0               # via pyxform, tabulator
 xlwt==1.2.0
 yapf==0.16.3