Merge pull request #81 from blockchain-certificates/kh_depFixes

update dependencies and remove dependency on parse_requirements

bitcoin_requirements.txt

@@ -1,2 +1 @@
--r requirements.txt
-python-bitcoinlib>=0.8.0
+python-bitcoinlib>=0.10.1

cert_issuer/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.11'
+__version__ = '2.0.12'

ethereum_requirements.txt

@@ -1,3 +1,2 @@
--r requirements.txt
-ethereum>=2.1.0
+ethereum>=2.3.1
 rlp>=0.6.0

requirements.txt

@@ -1,11 +1,12 @@
-cert-core>=2.1.6
-cert-schema>=2.1.4
-chainpoint==0.0.2
+cert-core>=2.1.8
+cert-schema>=2.1.5
+chainpoint>=0.0.2
 configargparse==0.12.0
 glob2==0.6
 mock==2.0.0
 requests[security]>=2.18.4
 pycoin>=0.80
-pyld>=0.8.1
+pyld>=1.0.3
 pysha3>=1.0.2
-tox>=2.7.0
+python-bitcoinlib>=0.10.1
+tox>=3.0.0

setup.py

@@ -2,7 +2,6 @@
 from distutils.core import Command
 
 import pip
-from pip.req import parse_requirements
 from setuptools import find_packages
 from setuptools import setup
 
@@ -13,8 +12,9 @@
 with open(os.path.join(here, 'README.md')) as fp:
     long_description = fp.read()
 
-install_reqs = parse_requirements('bitcoin_requirements.txt', session=False)
-reqs = [str(ir.req) for ir in install_reqs]
+with open('requirements.txt') as f:
+    install_reqs = f.readlines()
+    reqs = [str(ir) for ir in install_reqs]
 
 
 class InstallCommand(Command):
@@ -31,10 +31,16 @@ def finalize_options(self):
 
     def run(self):
         if self.blockchain == 'ethereum':
-            install_reqs = parse_requirements('ethereum_requirements.txt', session=False)
-            eth_reqs = [str(ir.req) for ir in install_reqs]
-            reqs.append(eth_reqs)
-            install(eth_reqs)
+            with open('ethereum_requirements.txt') as f:
+                install_reqs = f.readlines()
+                eth_reqs = [str(ir) for ir in install_reqs]
+                reqs.append(eth_reqs)
+        else:
+            with open('bitcoin_requirements.txt') as f:
+                install_reqs = f.readlines()
+                btc_reqs = [str(ir) for ir in install_reqs]
+                reqs.append(btc_reqs)
+        install(reqs)
 
 def install(packages):
     for package in packages: