From 6a6a19207cd18e34781aaf2448293c72f490a954 Mon Sep 17 00:00:00 2001
From: zzappie <mail@davie.li>
Date: Mon, 6 Dec 2021 13:09:51 +0000
Subject: [PATCH] [WIP] Maintenance release (#2728)

* Dependencies update

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

* Dockerfile-dev: update python version + remove system pynacl

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

* Set dummy_transaction fixture scope to "session"

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

* Add 3.7 and 3.8 python tests

* setup.py: fix version typo
---
 .ci/travis-install.sh    |  3 ---
 .travis.yml              | 39 ++++++++++++++++++++++++++++++---------
 Dockerfile-dev           |  3 +--
 setup.py                 | 26 +++++++++++++-------------
 tests/common/conftest.py |  2 +-
 tox.ini                  |  7 ++++---
 6 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/.ci/travis-install.sh b/.ci/travis-install.sh
index 579ba2f1..0e2c6f14 100755
--- a/.ci/travis-install.sh
+++ b/.ci/travis-install.sh
@@ -13,9 +13,6 @@ if [[ -n ${TOXENV} ]]; then
     pip install --upgrade tox
 elif [[ ${BIGCHAINDB_CI_ABCI} == 'enable' ]]; then
     docker-compose build --no-cache --build-arg abci_status=enable bigchaindb
-elif [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then
-    docker-compose build --build-arg python_version=3.5 --no-cache bigchaindb
-    pip install --upgrade codecov
 elif [[ $BIGCHAINDB_INTEGRATION_TEST == 'enable' ]]; then
     docker-compose build bigchaindb python-driver
 else
diff --git a/.travis.yml b/.travis.yml
index 628b333a..f2bb542f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
-# Copyright © 2020 Interplanetary Database Association e.V.,
+# Copyright © 2020, 2021 Interplanetary Database Association e.V.,
 # BigchainDB and IPDB software contributors.
 # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
 sudo: required
 
-dist: trusty
+dist: focal
 
 services:
   - docker
@@ -14,23 +14,19 @@ language: python
 cache: pip
 
 python:
-  - 3.5
   - 3.6
+  - 3.7
+  - 3.8
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.19.0
+    - DOCKER_COMPOSE_VERSION=1.29.2
   matrix:
     - TOXENV=flake8
     - TOXENV=docsroot
 
 matrix:
   fast_finish: true
-  exclude:
-  - python: 3.5
-    env: TOXENV=flake8
-  - python: 3.5
-    env: TOXENV=docsroot
   include:
   - python: 3.6
     env:
@@ -44,6 +40,31 @@ matrix:
   - python: 3.6
     env:
     - BIGCHAINDB_ACCEPTANCE_TEST=enable
+  - python: 3.7
+    env:
+    - BIGCHAINDB_DATABASE_BACKEND=localmongodb
+    - BIGCHAINDB_DATABASE_SSL=
+  - python: 3.7
+    env:
+    - BIGCHAINDB_DATABASE_BACKEND=localmongodb
+    - BIGCHAINDB_DATABASE_SSL=
+    - BIGCHAINDB_CI_ABCI=enable
+  - python: 3.7
+    env:
+    - BIGCHAINDB_ACCEPTANCE_TEST=enable
+  - python: 3.8
+    env:
+    - BIGCHAINDB_DATABASE_BACKEND=localmongodb
+    - BIGCHAINDB_DATABASE_SSL=
+  - python: 3.8
+    env:
+    - BIGCHAINDB_DATABASE_BACKEND=localmongodb
+    - BIGCHAINDB_DATABASE_SSL=
+    - BIGCHAINDB_CI_ABCI=enable
+  - python: 3.8
+    env:
+    - BIGCHAINDB_ACCEPTANCE_TEST=enable
+
 
 before_install: sudo .ci/travis-before-install.sh
 
diff --git a/Dockerfile-dev b/Dockerfile-dev
index abadbecc..40f38d90 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -3,9 +3,8 @@ FROM python:${python_version}
 LABEL maintainer "contact@ipdb.global"
 
 RUN apt-get update \
-    && apt-get install -y vim \
+    && apt-get install -y git \
     && pip install -U pip \
-    && pip install pynacl \
     && apt-get autoremove \
     && apt-get clean
 
diff --git a/setup.py b/setup.py
index 7f81fce0..c93e30e2 100644
--- a/setup.py
+++ b/setup.py
@@ -71,22 +71,22 @@ tests_require = [
 ] + docs_require
 
 install_requires = [
-    'aiohttp==3.6.2',
-    'bigchaindb-abci==1.0.5',
-    'cryptoconditions==0.8.0',
-    'flask-cors==3.0.8',
-    'flask-restful==0.3.8',
-    'flask==1.1.2',
-    'gunicorn==20.0.4',
+    'aiohttp==3.7.4',
+    'bigchaindb-abci==1.0.7',
+    'cryptoconditions==0.8.1',
+    'flask-cors==3.0.10',
+    'flask-restful==0.3.9',
+    'flask==2.0.1',
+    'gunicorn==20.1.0',
     'jsonschema==3.2.0',
     'logstats==0.3.0',
-    'packaging>=20.0.0',  # Dockerfile-alpine required for pkg has ver 20.0.4
+    'packaging>=20.9',
     # TODO Consider not installing the db drivers, or putting them in extras.
-    'pymongo==3.7.2',
-    'python-rapidjson==0.9.1',
-    'pyyaml==5.3.1',
-    'requests==2.23.0',
-    'setproctitle==1.1.10',
+    'pymongo==3.11.4',
+    'python-rapidjson==1.0',
+    'pyyaml==5.4.1',
+    'requests==2.25.1',
+    'setproctitle==1.2.2',
 ]
 
 if sys.version_info < (3, 6):
diff --git a/tests/common/conftest.py b/tests/common/conftest.py
index 828d4e7d..10865df3 100644
--- a/tests/common/conftest.py
+++ b/tests/common/conftest.py
@@ -166,7 +166,7 @@ def transfer_tx(transfer_utx, user_priv):
     return transfer_utx.sign([user_priv])
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def dummy_transaction():
     return {
         'asset': {'data': None},
diff --git a/tox.ini b/tox.ini
index 08d46796..c983d4df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 skipsdist = true
-envlist = py{35,36}, flake8, docsroot
+envlist = py{36,37,38}, flake8, docsroot
 
 [base]
-basepython = python3.6
-deps = pip>=9.0.1   
+basepython = python3.8
+deps = pip>=9.0.1
 
 [testenv]
 usedevelop = True
@@ -29,6 +29,7 @@ basepython = {[base]basepython}
 changedir = docs/root/source
 deps =
     {[base]deps}
+    typing-extensions
     -r{toxinidir}/docs/root/requirements.txt
 extras = None
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html