diff --git a/README.md b/README.md index 1584d55517f9260e0c9ef17c0b96ebfac23122f1..9e9ee3493496d589967ea45039d6ba70f02780bd 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 c1045527f47e8be403dc2abea4a16c2ad318ed36..d75fa9f9bd24019a11b2ead1dba222f82f1f75ec 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 5f01cdad85221aad8799ff64d87c575abcc2db36..81d5c8bd3fda49bd5c0bb78c4b7344790d26d507 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 0e485d2a1e690bd67121662d08e5499f3099658a..d8696895da3095eb60bedfb6f9acf7120f074914 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 f1ee004959f05c57ad5c073dd7116fa2504717aa..588ac31de95fe7b993f4ca2e5c3cb1e60f7ae4cf 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'],