Remove pysha3 for python >= 3.6 (#2652)

* Init pypy support

* Fixed setup
This commit is contained in:
Nikita Chernyi 2019-09-25 20:22:51 +00:00 committed by Jürgen Eckel
parent df23bec320
commit 2975c372c8
7 changed files with 26 additions and 8 deletions

View File

@ -5,7 +5,11 @@
# Separate all crypto code so that we can easily test several implementations # Separate all crypto code so that we can easily test several implementations
from collections import namedtuple from collections import namedtuple
import sha3 try:
from hashlib import sha3_256
except ImportError:
from sha3 import sha3_256
from cryptoconditions import crypto from cryptoconditions import crypto
@ -14,7 +18,7 @@ CryptoKeypair = namedtuple('CryptoKeypair', ('private_key', 'public_key'))
def hash_data(data): def hash_data(data):
"""Hash the provided data using SHA3-256""" """Hash the provided data using SHA3-256"""
return sha3.sha3_256(data.encode()).hexdigest() return sha3_256(data.encode()).hexdigest()
def generate_key_pair(): def generate_key_pair():

View File

@ -19,7 +19,10 @@ import base58
from cryptoconditions import Fulfillment, ThresholdSha256, Ed25519Sha256 from cryptoconditions import Fulfillment, ThresholdSha256, Ed25519Sha256
from cryptoconditions.exceptions import ( from cryptoconditions.exceptions import (
ParsingError, ASN1DecodeError, ASN1EncodeError, UnsupportedTypeError) ParsingError, ASN1DecodeError, ASN1EncodeError, UnsupportedTypeError)
from sha3 import sha3_256 try:
from hashlib import sha3_256
except ImportError:
from sha3 import sha3_256
from bigchaindb.common.crypto import PrivateKey, hash_data from bigchaindb.common.crypto import PrivateKey, hash_data
from bigchaindb.common.exceptions import (KeypairMismatchException, from bigchaindb.common.exceptions import (KeypairMismatchException,

View File

@ -74,7 +74,6 @@ tests_require = [
install_requires = [ install_requires = [
# TODO Consider not installing the db drivers, or putting them in extras. # TODO Consider not installing the db drivers, or putting them in extras.
'pymongo~=3.6', 'pymongo~=3.6',
'pysha3~=1.0.2',
'cryptoconditions==0.8.0', 'cryptoconditions==0.8.0',
'python-rapidjson~=0.6.0', 'python-rapidjson~=0.6.0',
'logstats~=0.2.1', 'logstats~=0.2.1',
@ -91,6 +90,9 @@ install_requires = [
'packaging~=18.0', 'packaging~=18.0',
] ]
if sys.version_info < (3, 6):
install_requires.append('pysha3~=1.0.2')
setup( setup(
name='BigchainDB', name='BigchainDB',
version=version['__version__'], version=version['__version__'],

View File

@ -11,7 +11,10 @@ from copy import deepcopy
from base58 import b58encode, b58decode from base58 import b58encode, b58decode
from cryptoconditions import Ed25519Sha256 from cryptoconditions import Ed25519Sha256
from pytest import mark, raises from pytest import mark, raises
from sha3 import sha3_256 try:
from hashlib import sha3_256
except ImportError:
from sha3 import sha3_256
pytestmark = mark.bdb pytestmark = mark.bdb

View File

@ -9,7 +9,10 @@ structural / schematic issues are caught when reading a transaction
import json import json
import pytest import pytest
import sha3 try:
import hashlib as sha3
except ImportError:
import sha3
from unittest.mock import MagicMock from unittest.mock import MagicMock
from bigchaindb.common.exceptions import (AmountError, from bigchaindb.common.exceptions import (AmountError,

View File

@ -8,7 +8,10 @@ from unittest.mock import Mock, patch
import base58 import base58
import pytest import pytest
from cryptoconditions import Ed25519Sha256 from cryptoconditions import Ed25519Sha256
from sha3 import sha3_256 try:
from hashlib import sha3_256
except ImportError:
from sha3 import sha3_256
from bigchaindb.common import crypto from bigchaindb.common import crypto
from bigchaindb.common.transaction_mode_types import (BROADCAST_TX_COMMIT, from bigchaindb.common.transaction_mode_types import (BROADCAST_TX_COMMIT,