From 9ac1f998853bf8284a61125f7779bc9146153986 Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Mon, 26 Mar 2018 19:25:16 +0300 Subject: [PATCH] Fix setup.py - Only leave Django in `install_requires`. We do not use setup.py for python library dependency management and should only keep the bare minimum inside `install_requires`. Having many un-updated things here may break tools like `pip-compile` for people who include onadata in their python requirements files. - Remove `dependency_links` completely. This is more accurately handled in our requirement files. - Exclude tests and docs from `find_packages` - Add module docstring --- setup.py | 112 +++++++++---------------------------------------------- 1 file changed, 18 insertions(+), 94 deletions(-) diff --git a/setup.py b/setup.py index e4dbc18def..70ed432763 100644 --- a/setup.py +++ b/setup.py @@ -1,101 +1,25 @@ -from setuptools import setup, find_packages +""" +Setup file for onadata + +Ona is a social enterprise that builds the data infrastructure to drive change. +We believe technology affords new opportunities for governments and development +organizations to be increasingly data driven, collaborative and accountable. +Our goal is never simply to build a great product, but to support great +outcomes. +See: +https://github.com/onaio/onadata +https://ona.io +""" + +from setuptools import setup, find_packages setup( - name="core", - version="1.1.4", # dev version + name="onadata", + version="1.13.0", description="Collect Analyze and Share Data!", author="Ona Systems Inc", author_email="support@ona.io", license="Copyright (c) 2014 Ona Systems Inc All rights reserved.", - packages=find_packages(), - # pip is unable to install from git repos so we will depend on Makefile - # for this - dependency_links=[ - 'http://github.com/onaio/pxform.git@onaio#egg=pyxform', - 'http://github.com/onaio/django-digest.git@django-1.9-fixes#' - 'egg=django-digest', - 'http://github.com/jbalogh/django-nose.git#egg=django-nose', - 'http://github.com/onaio/python-json2xlsclient.git#egg=j2xclient', - 'http://github.com/onaio/django-cors-headers.git@allow-all-for-url#' - 'egg=cors-headers', - 'http://bitbucket.org/fomcl/savreaderwriter/downloads/' - 'savReaderWriter-3.4.2.zip'], - install_requires=[ - 'alabaster==0.7.7', - 'amqp==1.4.9', - 'anyjson==0.3.3', - 'babel==2.3.3', - 'billiard==3.3.0.23', - 'celery==3.1.23', - 'defusedxml==0.4.1', - 'dict2xml==1.4', - 'django-braces==1.8.1', - 'django-celery==3.1.17', - 'django-db-readonly==0.4.1', - 'django-filter==0.13.0', - 'django-guardian==1.4.4', - 'django-oauth-toolkit==0.10.0', - 'django-ordered-model==1.1.0', - 'django-query-builder==0.10.0', - 'django-registration-redux==1.4', - 'django-reversion==1.10.2', - 'django-taggit==0.18.1', - 'django-templated-email==0.4.9', - 'Django==1.9.5', - 'djangorestframework-csv==1.4.1', - 'djangorestframework-gis==0.10.1', - 'djangorestframework-jsonp==1.0.2', - 'djangorestframework-xml==1.3.0', - 'djangorestframework==3.3.3', - 'docutils==0.12', - 'dpath==1.4.0', - 'elaphe==0.6.0', - 'et-xmlfile==1.0.1', - 'fleming==0.4.3', - 'funcsigs==1.0.0', - 'geojson==1.3.2', - 'google-api-python-client==1.5.0', - 'gspread==0.3.0', - 'httmock==1.2.5', - 'httplib2==0.9.2', - 'imagesize==0.7.0', - 'jdcal==1.2', - 'Jinja2==2.8', - 'jsonfield==0.9.23', - 'kombu==3.0.35', - 'librabbitmq==1.6.1', - 'lxml==3.6.0', - 'Markdown==2.6.6', - 'MarkupSafe==0.23', - 'mock==2.0.0', - 'modilabs-python-utils==0.1.5', - 'nose==1.3.7', - 'numpy==1.11.0', - 'oauth2client==2.0.2', - 'oauthlib==1.0.3', - 'openpyxl==2.3.5', - 'ordereddict==1.1', - 'pbr==1.9.1', - 'Pillow==3.2.0', - 'psycopg2==2.6.1', - 'pyasn1-modules==0.0.8', - 'pyasn1==0.1.9', - 'Pygments==2.1.3', - 'PyJWT==1.4.0', - 'pylibmc==1.5.1', - 'pymongo==3.2.2', - 'python-dateutil==2.5.2', - 'python-digest==1.7', - 'python-memcached==1.57', - 'pytz==2016.3', - 'recaptcha-client==1.0.6', - 'requests==2.9.1', - 'rsa==3.4.2', - 'simplejson==3.8.2', - 'six==1.10.0', - 'snowballstemmer==1.2.1', - 'sphinx==1.4.1', - 'unicodecsv==0.14.1', - 'xlrd==0.8.0', - 'xlwt==1.0.0']) + packages=find_packages(exclude=['docs', 'tests']), + install_requires=['Django==1.11.11'])