[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
This commit is contained in:
zzappie 2021-12-06 13:09:51 +00:00 committed by GitHub
parent caf31647e0
commit 6a6a19207c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 31 deletions

View File

@ -13,9 +13,6 @@ if [[ -n ${TOXENV} ]]; then
pip install --upgrade tox pip install --upgrade tox
elif [[ ${BIGCHAINDB_CI_ABCI} == 'enable' ]]; then elif [[ ${BIGCHAINDB_CI_ABCI} == 'enable' ]]; then
docker-compose build --no-cache --build-arg abci_status=enable bigchaindb 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 elif [[ $BIGCHAINDB_INTEGRATION_TEST == 'enable' ]]; then
docker-compose build bigchaindb python-driver docker-compose build bigchaindb python-driver
else else

View File

@ -1,11 +1,11 @@
# Copyright © 2020 Interplanetary Database Association e.V., # Copyright © 2020, 2021 Interplanetary Database Association e.V.,
# BigchainDB and IPDB software contributors. # BigchainDB and IPDB software contributors.
# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
# Code is Apache-2.0 and docs are CC-BY-4.0 # Code is Apache-2.0 and docs are CC-BY-4.0
sudo: required sudo: required
dist: trusty dist: focal
services: services:
- docker - docker
@ -14,23 +14,19 @@ language: python
cache: pip cache: pip
python: python:
- 3.5
- 3.6 - 3.6
- 3.7
- 3.8
env: env:
global: global:
- DOCKER_COMPOSE_VERSION=1.19.0 - DOCKER_COMPOSE_VERSION=1.29.2
matrix: matrix:
- TOXENV=flake8 - TOXENV=flake8
- TOXENV=docsroot - TOXENV=docsroot
matrix: matrix:
fast_finish: true fast_finish: true
exclude:
- python: 3.5
env: TOXENV=flake8
- python: 3.5
env: TOXENV=docsroot
include: include:
- python: 3.6 - python: 3.6
env: env:
@ -44,6 +40,31 @@ matrix:
- python: 3.6 - python: 3.6
env: env:
- BIGCHAINDB_ACCEPTANCE_TEST=enable - 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 before_install: sudo .ci/travis-before-install.sh

View File

@ -3,9 +3,8 @@ FROM python:${python_version}
LABEL maintainer "contact@ipdb.global" LABEL maintainer "contact@ipdb.global"
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y vim \ && apt-get install -y git \
&& pip install -U pip \ && pip install -U pip \
&& pip install pynacl \
&& apt-get autoremove \ && apt-get autoremove \
&& apt-get clean && apt-get clean

View File

@ -71,22 +71,22 @@ tests_require = [
] + docs_require ] + docs_require
install_requires = [ install_requires = [
'aiohttp==3.6.2', 'aiohttp==3.7.4',
'bigchaindb-abci==1.0.5', 'bigchaindb-abci==1.0.7',
'cryptoconditions==0.8.0', 'cryptoconditions==0.8.1',
'flask-cors==3.0.8', 'flask-cors==3.0.10',
'flask-restful==0.3.8', 'flask-restful==0.3.9',
'flask==1.1.2', 'flask==2.0.1',
'gunicorn==20.0.4', 'gunicorn==20.1.0',
'jsonschema==3.2.0', 'jsonschema==3.2.0',
'logstats==0.3.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. # TODO Consider not installing the db drivers, or putting them in extras.
'pymongo==3.7.2', 'pymongo==3.11.4',
'python-rapidjson==0.9.1', 'python-rapidjson==1.0',
'pyyaml==5.3.1', 'pyyaml==5.4.1',
'requests==2.23.0', 'requests==2.25.1',
'setproctitle==1.1.10', 'setproctitle==1.2.2',
] ]
if sys.version_info < (3, 6): if sys.version_info < (3, 6):

View File

@ -166,7 +166,7 @@ def transfer_tx(transfer_utx, user_priv):
return transfer_utx.sign([user_priv]) return transfer_utx.sign([user_priv])
@pytest.fixture @pytest.fixture(scope="session")
def dummy_transaction(): def dummy_transaction():
return { return {
'asset': {'data': None}, 'asset': {'data': None},

View File

@ -1,10 +1,10 @@
[tox] [tox]
skipsdist = true skipsdist = true
envlist = py{35,36}, flake8, docsroot envlist = py{36,37,38}, flake8, docsroot
[base] [base]
basepython = python3.6 basepython = python3.8
deps = pip>=9.0.1 deps = pip>=9.0.1
[testenv] [testenv]
usedevelop = True usedevelop = True
@ -29,6 +29,7 @@ basepython = {[base]basepython}
changedir = docs/root/source changedir = docs/root/source
deps = deps =
{[base]deps} {[base]deps}
typing-extensions
-r{toxinidir}/docs/root/requirements.txt -r{toxinidir}/docs/root/requirements.txt
extras = None extras = None
commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html