Merge pull request bitshares#17 from BTS-CM/pycryptodome

xeroc · web-flow · commit 403d4b9384c9 · 2017-11-14T11:13:06.000+01:00
pycryptodome &amp; readme updates
diff --git a/README.md b/README.md
@@ -1,4 +1,27 @@
-Python Library for BitShares
-========================
+# Python Library for BitShares
 
-*placeholder*
+---
+
+## Documentation
+
+Visit the [pybitshares website](http://docs.pybitshares.com/en/latest/) for in depth documentation on this Python library.
+
+## Installation
+
+### Install with pip:
+```
+$ sudo apt-get install libffi-dev libssl-dev python-dev python-dev3
+$ pip3 install bitshares
+```
+
+### Manual installation:
+```
+$ git clone https://github.com/xeroc/python-bitshares/
+$ cd python-bitshares
+$ python3 setup.py install --user
+```
+
+### Upgrade
+```
+$ pip3 install --user --upgrade
+```
diff --git a/bitsharesbase/memo.py b/bitsharesbase/memo.py
@@ -4,7 +4,7 @@
 try:
     from Crypto.Cipher import AES
 except ImportError:
-    raise ImportError("Missing dependency: pycrypto")
+    raise ImportError("Missing dependency: pycryptodome")
 from .account import PrivateKey, PublicKey
 import struct
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,5 @@
 graphenelib
 bitshares
 autobahn>=0.14
-pycrypto==2.6.1
-appdirs==1.4.0
+pycryptodome==3.4.6
+appdirs==1.4.0
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,7 +1,7 @@
 graphenelib
-pycrypto==2.6.1
+pycryptodome==3.4.6
 scrypt==0.7.1
 Events==0.2.2
 pyyaml
 pytest
-coverage
+coverage
diff --git a/setup.py b/setup.py
@@ -45,7 +45,7 @@
         "appdirs",
         "Events",
         "scrypt",
-        "pycrypto",  # for AES, installed through graphenelib already
+        "pycryptodome",  # for AES, installed through graphenelib already
     ],
     setup_requires=['pytest-runner'],
     tests_require=['pytest'],
