From b19aae1aca63b454c4ae756ddf045d99a7a2d8f5 Mon Sep 17 00:00:00 2001
From: grcgrc <grctestemail@gmail.com>
Date: Sun, 1 Oct 2017 15:33:12 +0100
Subject: [PATCH] pycryptodome & readme updates
pycrypto has been depreciated & replaced with pycryptodome.
---
README.md | 29 ++++++++++++++++++++++++++---
bitsharesbase/memo.py | 2 +-
docs/requirements.txt | 4 ++--
requirements-test.txt | 4 ++--
setup.py | 2 +-
5 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 1584d555..9e9ee349 100644
--- 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
+```
\ No newline at end of file
diff --git a/bitsharesbase/memo.py b/bitsharesbase/memo.py
index c1045527..d75fa9f9 100644
--- a/bitsharesbase/memo.py
+++ b/bitsharesbase/memo.py
@@ -4,7 +4,7 @@ from binascii import hexlify, unhexlify
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
index 5f01cdad..81d5c8bd 100644
--- 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
\ No newline at end of file
diff --git a/requirements-test.txt b/requirements-test.txt
index 0e485d2a..d8696895 100644
--- 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
\ No newline at end of file
diff --git a/setup.py b/setup.py
index f1ee0049..588ac31d 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
"appdirs",
"Events",
"scrypt",
- "pycrypto", # for AES, installed through graphenelib already
+ "pycryptodome", # for AES, installed through graphenelib already
],
setup_requires=['pytest-runner'],
tests_require=['pytest'],
--
GitLab