From ccdbb91c1ca58e78d07958d2776f2e43a1ab42c2 Mon Sep 17 00:00:00 2001 From: Scott Sadler Date: Mon, 23 Jan 2017 15:16:15 +0100 Subject: [PATCH] short form 0.9, 0.10 etc tx version with no '.dev' suffix --- bigchaindb/common/transaction.py | 2 +- tests/common/test_transaction.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bigchaindb/common/transaction.py b/bigchaindb/common/transaction.py index bda62663..1bc0b1a5 100644 --- a/bigchaindb/common/transaction.py +++ b/bigchaindb/common/transaction.py @@ -410,7 +410,7 @@ class Transaction(object): TRANSFER = 'TRANSFER' GENESIS = 'GENESIS' ALLOWED_OPERATIONS = (CREATE, TRANSFER, GENESIS) - VERSION = bigchaindb.version.__version__ + VERSION = bigchaindb.version.__short_version__[:-4] # 0.9, 0.10 etc def __init__(self, operation, asset, inputs=None, outputs=None, metadata=None, version=None): diff --git a/tests/common/test_transaction.py b/tests/common/test_transaction.py index b4ef427c..da0fba17 100644 --- a/tests/common/test_transaction.py +++ b/tests/common/test_transaction.py @@ -966,11 +966,13 @@ def test_cant_add_empty_input(): def test_validate_version(utx): + import re import bigchaindb.version from .utils import validate_transaction_model from bigchaindb.common.exceptions import SchemaValidationError - assert utx.version == bigchaindb.version.__version__ + short_ver = bigchaindb.version.__short_version__ + assert utx.version == re.match(r'^(.*\d)', short_ver).group(1) validate_transaction_model(utx)