From 090840ee2535a231773aac634347a7cf488115f3 Mon Sep 17 00:00:00 2001
From: jobevers <jobevers@users.noreply.github.com>
Date: Thu, 23 Feb 2017 14:18:52 -0600
Subject: [PATCH] cleaner separation between requirements and setup

---
 requirements.txt | 10 +++++-----
 setup.py         | 30 +++++++++++-------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5b3a31fea..273806de4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,30 +1,30 @@
 Twisted==16.6.0
 appdirs==1.4.0
 argparse==1.2.1
+base58==0.2.2
 colorama==0.3.7
 dnspython==1.12.0
 ecdsa==0.13
 envparse==0.2.0
 gmpy==1.17
+googlefinance==0.7
 jsonrpc==1.2
 jsonrpclib==0.1.7
 jsonschema==2.5.1
-loggly-python-handler==1.0.0
+git+https://github.com/lbryio/lbryum.git
 miniupnpc==1.9
 pbkdf2==1.3
 protobuf==3.0.0
 pycrypto==2.6.1
+pyyaml==3.12
 qrcode==5.2.2
 requests==2.9.1
 requests_futures==0.9.7
 seccure==0.3.1.3
+service_identity==16.0.0
 simplejson==3.8.2
 six>=1.9.0
 slowaes==0.1a1
 txJSON-RPC==0.5
 wsgiref==0.1.2
 zope.interface==4.3.3
-base58==0.2.2
-googlefinance==0.7
-pyyaml==3.12
-service_identity==16.0.0
diff --git a/setup.py b/setup.py
index 70751f0a1..6155f8521 100644
--- a/setup.py
+++ b/setup.py
@@ -18,39 +18,31 @@ keywords = "LBRY"
 
 
 # TODO: find a way to keep this in sync with requirements.txt
+#
+# Note though that this list is intentionally less restrictive than
+# requirements.txt. This is only the libraries that are direct
+# dependencies of the lbrynet library.  requirements.txt includes
+# dependencies of dependencies and specific versions that we know
+# all work together.
+# See https://packaging.python.org/requirements/ for more details.
 requires = [
     'Twisted',
     'appdirs',
-    'argparse',
-    'colorama',
-    'dnspython',
-    'ecdsa',
+    'base58',
     'envparse',
-    'gmpy',
+    'googlefinance',
     'jsonrpc',
-    'jsonrpclib',
     'jsonschema',
-    'lbryum',
-    'loggly-python-handler',
+    'lbryum>=2.7.6',
     'miniupnpc',
-    'pbkdf2',
-    'protobuf',
     'pycrypto',
-    'qrcode',
+    'pyyaml',
     'requests',
     'requests_futures',
     'seccure',
     'simplejson',
-    'six',
-    'slowaes',
     'txJSON-RPC',
-    'wsgiref',
     'zope.interface',
-    'base58',
-    'googlefinance',
-    'pyyaml',
-    'service_identity',
-    'ndg-httpsclient',
 ]