From 8ac42541163435b915d396622665fb0a834c4c2a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 22 Feb 2017 06:56:29 -0500 Subject: [PATCH] Sync requirements and add license info Follow guidelines in: https://packaging.python.org/requirements/ * Make sure the same list of packages are in setup.cfg and requirements.txt * install_requires reqs in setup.cfg should be "Abstract" with no version information * Add License information for each package Fixes #131 --- requirements.txt | 18 +++++++++--------- setup.py | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2674d78ff5..6bcba8b1c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -certifi >= 14.05.14 -six>=1.9.0 -python_dateutil >= 2.5.3 -setuptools >= 21.0.0 -urllib3 >= 1.19.1 -pyyaml >= 3.12 -oauth2client >= 4.0.0 -ipaddress >= 1.0.17 -websocket-client>=0.32.0 +certifi>=14.05.14 # MPL +six>=1.9.0 # MIT +python-dateutil>=2.5.3 # BSD +setuptools>=21.0.0 # PSF/ZPL +urllib3>=1.19.1 # MIT +pyyaml>=3.12 # MIT +oauth2client>=4.0.0 # Apache-2.0 +ipaddress>=1.0.17 # PSF +websocket-client>=0.32.0 # LGPLv2+ diff --git a/setup.py b/setup.py index d20b068d58..eeea40c154 100644 --- a/setup.py +++ b/setup.py @@ -28,13 +28,16 @@ # http://pypi.python.org/pypi/setuptools REQUIRES = [ - "urllib3 >= 1.19", - "six >= 1.10", "certifi", + "ipaddress", + "oauth2client", + "setuptools", + "six", + "urllib3", "python-dateutil", "pyyaml", - "oauth2client", - "ipaddress"] + "websocket-client", +] setup( name=PACKAGE_NAME,