From 186cd874443e957fd23ebba20e72373baf63614d Mon Sep 17 00:00:00 2001
From: David Dashyan <mail@davie.li>
Date: Tue, 14 Apr 2020 21:59:51 +0000
Subject: [PATCH] Updated bigchaindb-abci (#2689)

* Updated bigchaindb-abci

Reason: gevent API change breaks BigchainDB installation
Signed-off-by: David Dashyan <mail@davie.li>

* Version bump

Signed-off-by: David Dashyan <mail@davie.li>

* Updated changelog
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 acceptance/python/src/test_naughty_strings.py |  7 +++++--
 bigchaindb/version.py                         |  2 +-
 setup.py                                      |  6 +++---
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1adbfb07..6088236b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,25 @@ For reference, the possible headings are:
 * **Known Issues**
 * **Notes**
 
+## [2.2.1] - 2020-04-14
+
+### Fixed
+
+Gevent library API update is incompatible with  bigchaindb-abci 1.0.1 version.
+Updated bigchaindb-abci.
+
+## [2.2.0] - 2020-02-20
+
+### Added
+
+Support for multiple ABCI versions.
+
+## [2.1.0] - 2019-11-06
+
+### Added
+
+Option for last transaction retrieval added.
+
 ## [2.0] - 2019-09-26
 
 ### Changed
diff --git a/acceptance/python/src/test_naughty_strings.py b/acceptance/python/src/test_naughty_strings.py
index 61776048..35746bc9 100644
--- a/acceptance/python/src/test_naughty_strings.py
+++ b/acceptance/python/src/test_naughty_strings.py
@@ -66,8 +66,11 @@ def send_naughty_tx(asset, metadata):
         # Then she expects a nicely formatted error code
         status_code = sent_transaction.status_code
         error = sent_transaction.error
-        regex = '\{"message":"Invalid transaction \\(ValidationError\\): Invalid key name .* in asset object. ' \
-                'The key name cannot contain characters .* or null characters","status":400\}\n'
+        regex = (
+            r'\{\s*\n*'
+            r'\s*"message": "Invalid transaction \(ValidationError\): Invalid key name.*The key name cannot contain characters.*\n*' # noqa
+            r'\s*"status": 400\n*'
+            r'\s*\}\n*')
         assert status_code == 400
         assert re.fullmatch(regex, error), sent_transaction
     # Otherwise, she expects to see her transaction in the database
diff --git a/bigchaindb/version.py b/bigchaindb/version.py
index 22b3036e..a54415a4 100644
--- a/bigchaindb/version.py
+++ b/bigchaindb/version.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 __short_version__ = '2.2'
 
 # Supported Tendermint versions
diff --git a/setup.py b/setup.py
index c99c0740..27c5f091 100644
--- a/setup.py
+++ b/setup.py
@@ -77,15 +77,15 @@ install_requires = [
     'cryptoconditions==0.8.0',
     'python-rapidjson~=0.6.0',
     'logstats~=0.2.1',
-    'flask>=0.10.1',
+    'flask~=0.12.4',
     'flask-cors~=3.0.0',
     'flask-restful~=0.3.0',
-    'requests>=2.20.0',
+    'requests~=2.20.0',
     'gunicorn~=19.0',
     'jsonschema~=2.5.1',
     'pyyaml>=4.2b1',
     'aiohttp~=3.0',
-    'bigchaindb-abci==1.0.1',
+    'bigchaindb-abci>=1.0.2',
     'setproctitle~=1.1.0',
     'packaging~=18.0',
 ]