From f5af19081f7a5bbbc07baf03675d8eadb7fd0081 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Thu, 17 Dec 2020 11:10:13 +0100
Subject: [PATCH] Upgrade confini

---
 CHANGELOG        |  2 ++
 requirements.txt |  4 ++--
 setup.py         | 33 +++++++++++++++++++++------------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1baef84..b9b1e61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* 0.4.3
+	- Align rlp dependency to solve discrepancy in eth-tester/py-evm dependencies
 * 0.4.2
 	- Upgrade rlp depencency
 * 0.4.1
diff --git a/requirements.txt b/requirements.txt
index 3c7bbff..79635e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ psycopg2==2.8.6
 cryptography==3.2.1
 eth-keys==0.3.3
 pysha3==1.0.2
-rlp==2.0.1
+rlp==2.0.0a1
 json-rpc==1.13.0
-confini==0.3.2
+confini==0.3.3
 sqlalchemy==1.3.20
diff --git a/setup.py b/setup.py
index 2b51ce0..63ac29f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,27 @@ f = open('README.md', 'r')
 long_description = f.read()
 f.close()
 
+requirements = []
+f = open('requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    requirements.append(l.rstrip())
+f.close()
+
+test_requirements = []
+f = open('test_requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    test_requirements.append(l.rstrip())
+f.close()
+
 setup(
         name="crypto-dev-signer",
-        version="0.4.2",
+        version="0.4.3",
         description="A signer and keystore daemon and library for cryptocurrency software development",
         author="Louis Holbrook",
         author_email="dev@holbrook.no",
@@ -18,17 +36,8 @@ setup(
             'crypto_dev_signer.runnable',
             'crypto_dev_signer',
             ],
-        install_requires=[
-            'web3==5.12.2',
-            'psycopg2==2.8.6',
-            'cryptography==3.2.1',
-            'eth-keys==0.3.3',
-            'pysha3==1.0.2',
-            'rlp==2.0.1',
-            'json-rpc==1.13.0',
-            'confini==0.3.2',
-            'sqlalchemy==1.3.20',
-            ], 
+        install_requires=requirements,
+        tests_require=test_requirements,
         long_description=long_description,
         long_description_content_type='text/markdown',
         #scripts = [