From 86ef9bdb5603179286b4c3919c99d6a909d56ef4 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sun, 11 Apr 2021 15:09:16 +0200
Subject: [PATCH] Make sql requirements extras in packaging

---
 crypto_dev_signer/eth/transaction.py |  3 ++-
 requirements.txt                     |  2 --
 setup.py                             | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/crypto_dev_signer/eth/transaction.py b/crypto_dev_signer/eth/transaction.py
index 2e2cc92..cbe7cf6 100644
--- a/crypto_dev_signer/eth/transaction.py
+++ b/crypto_dev_signer/eth/transaction.py
@@ -4,7 +4,7 @@ import binascii
 import re
 
 # external imports
-from rlp import encode as rlp_encode
+#from rlp import encode as rlp_encode
 from hexathon import (
         strip_0x,
         add_0x,
@@ -13,6 +13,7 @@ from hexathon import (
 
 # local imports
 from crypto_dev_signer.eth.encoding import chain_id_to_v
+from crypto_dev_signer.eth.rlp import rlp_encode
 
 logg = logging.getLogger().getChild(__name__)
 
diff --git a/requirements.txt b/requirements.txt
index 14bc57b..8dfc671 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-psycopg2==2.8.6
 cryptography==3.2.1
 pysha3==1.0.2
 #simple-rlp==0.1.2
@@ -6,7 +5,6 @@ rlp==2.0.1
 eth-utils==1.10.0
 json-rpc==1.13.0
 confini~=0.3.6a3
-sqlalchemy==1.3.20
 coincurve==15.0.0
 pycrypto==2.6.1
 hexathon~=0.0.1a7
diff --git a/setup.py b/setup.py
index 13aaeb5..661d0e5 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,15 @@ while True:
     requirements.append(l.rstrip())
 f.close()
 
+sql_requirements = []
+f = open('sql_requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    sql_requirements.append(l.rstrip())
+f.close()
+
 test_requirements = []
 f = open('test_requirements.txt', 'r')
 while True:
@@ -24,7 +33,7 @@ f.close()
 
 setup(
         name="crypto-dev-signer",
-        version="0.4.14a17",
+        version="0.4.14b1",
         description="A signer and keystore daemon and library for cryptocurrency software development",
         author="Louis Holbrook",
         author_email="dev@holbrook.no",
@@ -39,6 +48,9 @@ setup(
             'crypto_dev_signer',
             ],
         install_requires=requirements,
+        extras_require={
+            'sql': sql_requirements,
+            },
         tests_require=test_requirements,
         long_description=long_description,
         long_description_content_type='text/markdown',