Merge branch 'main' into integration-test

Dockerfile-all-in-one

@@ -1,7 +1,7 @@
 FROM alpine:3.9
 LABEL maintainer "contact@ipdb.global"
 
-ARG TM_VERSION=v0.34.11
+ARG TM_VERSION=v0.34.15
 RUN mkdir -p /usr/src/app
 ENV HOME /root
 COPY . /usr/src/app/

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help run start stop logs test test-unit test-unit-watch test-acceptance test-integration cov doc doc-acceptance clean reset release dist check-deps clean-build clean-pyc clean-test
+.PHONY: help run start stop logs lint test test-unit test-unit-watch test-acceptance test-integration cov docs docs-acceptance clean reset release dist check-deps clean-build clean-pyc clean-test
 
 .DEFAULT_GOAL := help
 
@@ -70,6 +70,9 @@ stop: check-deps ## Stop Planetmint
 logs: check-deps ## Attach to the logs
 	@$(DC) logs -f planetmint
 
+lint: check-deps ## Lint the project
+	@$(DC) up lint
+
 test: check-deps test-unit test-acceptance ## Run unit and acceptance tests
 
 test-unit: check-deps ## Run all tests once
@@ -89,17 +92,16 @@ cov: check-deps ## Check code coverage and open the result in the browser
 	@$(DC) run --rm planetmint pytest -v --cov=planetmint --cov-report html
 	$(BROWSER) htmlcov/index.html
 
-doc: check-deps ## Generate HTML documentation and open it in the browser
+docs: check-deps ## Generate HTML documentation and open it in the browser
 	@$(DC) run --rm --no-deps bdocs make -C docs/root html
-	@$(DC) run --rm --no-deps bdocs make -C docs/server html
-	@$(DC) run --rm --no-deps bdocs make -C docs/contributing html
 	$(BROWSER) docs/root/build/html/index.html
 
-doc-acceptance: check-deps ## Create documentation for acceptance tests
+docs-acceptance: check-deps ## Create documentation for acceptance tests
 	@$(DC) run --rm python-acceptance pycco -i -s /src -d /docs
 	$(BROWSER) acceptance/python/docs/index.html
 
-clean: clean-build clean-pyc clean-test ## Remove all build, test, coverage and Python artifacts
+clean: check-deps ## Remove all build, test, coverage and Python artifacts
+	@$(DC) up clean
 	@$(ECHO) "Cleaning was successful."
 
 reset: check-deps ## Stop and REMOVE all containers. WARNING: you will LOSE all data stored in Planetmint.
@@ -126,22 +128,3 @@ ifndef IS_DOCKER_COMPOSE_INSTALLED
 	@$(ECHO)
 	@$(DC) # docker-compose is not installed, so we call it to generate an error and exit
 endif
-
-clean-build: # Remove build artifacts
-	@rm -fr build/
-	@rm -fr dist/
-	@rm -fr .eggs/
-	@find . -name '*.egg-info' -exec rm -fr {} +
-	@find . -name '*.egg' -exec rm -f {} +
-
-clean-pyc: # Remove Python file artifacts
-	@find . -name '*.pyc' -exec rm -f {} +
-	@find . -name '*.pyo' -exec rm -f {} +
-	@find . -name '*~' -exec rm -f {} +
-	@find . -name '__pycache__' -exec rm -fr {} +
-
-clean-test: # Remove test and coverage artifacts
-	@find . -name '.pytest_cache' -exec rm -fr {} +
-	@rm -fr .tox/
-	@rm -f .coverage
-	@rm -fr htmlcov/

README.md

@@ -43,10 +43,11 @@ There are also other commands you can execute:
 * `make start`: Run Planetmint from source and daemonize it (stop it with `make stop`).
 * `make stop`: Stop Planetmint.
 * `make logs`: Attach to the logs.
+* `make lint`: Lint the project
 * `make test`: Run all unit and acceptance tests.
 * `make test-unit-watch`: Run all tests and wait. Every time you change code, tests will be run again.
 * `make cov`: Check code coverage and open the result in the browser.
-* `make doc`: Generate HTML documentation and open it in the browser.
+* `make docs`: Generate HTML documentation and open it in the browser.
 * `make clean`: Remove all build, test, coverage and Python artifacts.
 * `make reset`: Stop and REMOVE all containers. WARNING: you will LOSE all data stored in Planetmint.
 

docker-compose.yml

@@ -51,7 +51,7 @@ services:
     command: '.ci/entrypoint.sh'
     restart: always
   tendermint:
-    image: tendermint/tendermint:v0.34.11
+    image: tendermint/tendermint:v0.34.15
     # volumes:
     #   - ./tmdata:/tendermint
     entrypoint: ''
@@ -114,3 +114,20 @@ services:
       - '33333:80'
     volumes:
       - ./docs/root/build/html:/usr/share/nginx/html
+
+  # Lints project according to PEP8
+  lint:
+    image: alpine/flake8
+    command: --max-line-length 119 /planetmint /acceptance /integration /tests
+    volumes:
+      - ./planetmint:/planetmint
+      - ./acceptance:/acceptance
+      - ./integration:/integration
+      - ./tests:/tests
+
+  # Remove all build, test, coverage and Python artifacts
+  clean:
+    image: alpine
+    command: /bin/sh -c "./planetmint/scripts/clean.sh"
+    volumes:
+      - $PWD:/planetmint

docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md

@@ -30,9 +30,9 @@ The version of Planetmint Server described in these docs only works well with Te
 
 ```bash
 $ sudo apt install -y unzip
-$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.11/tendermint_v0.34.11_linux_amd64.zip
+$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_v0.34.15_linux_amd64.zip
-$ unzip tendermint_v0.34.11_linux_amd64.zip
+$ unzip tendermint_v0.34.15_linux_amd64.zip
-$ rm tendermint_v0.34.11_linux_amd64.zip
+$ rm tendermint_v0.34.15_linux_amd64.zip
 $ sudo mv tendermint /usr/local/bin
 ```
 

docs/root/source/installation/network-setup/k8s-deployment-template/workflow.rst

@@ -60,7 +60,7 @@ you can do this:
 .. code::
 
    $ mkdir $(pwd)/tmdata
-   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.11 init
+   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.15 init
    $ cat $(pwd)/tmdata/genesis.json
 
 You should see something that looks like:

k8s/planetmint/tendermint_container/Dockerfile

@@ -1,4 +1,4 @@
-FROM tendermint/tendermint:v0.34.11
+FROM tendermint/tendermint:v0.34.15
 LABEL maintainer "contact@ipdb.global"
 WORKDIR /
 USER root

pkg/scripts/stack.sh

@@ -17,7 +17,7 @@ stack_size=${STACK_SIZE:=4}
 stack_type=${STACK_TYPE:="docker"}
 stack_type_provider=${STACK_TYPE_PROVIDER:=""}
 # NOTE versions prior v0.28.0 have different priv_validator format!
-tm_version=${TM_VERSION:="v0.34.11"}
+tm_version=${TM_VERSION:="v0.34.15"}
 mongo_version=${MONGO_VERSION:="3.6"}
 stack_vm_memory=${STACK_VM_MEMORY:=2048}
 stack_vm_cpus=${STACK_VM_CPUS:=2}

planetmint/__init__.py

@@ -71,7 +71,7 @@ config = {
     'tendermint': {
         'host': 'localhost',
         'port': 26657,
-        'version': 'v0.34.11',  # look for __tm_supported_versions__
+        'version': 'v0.34.15',  # look for __tm_supported_versions__
     },
     # FIXME: hardcoding to localmongodb for now
     'database': _database_map['localmongodb'],

planetmint/version.py

@@ -7,4 +7,4 @@ __version__ = '0.9.0'
 __short_version__ = '0.9'
 
 # Supported Tendermint versions
-__tm_supported_versions__ = ["0.34.11"]
+__tm_supported_versions__ = ["0.34.15"]

scripts/clean.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright © 2020 Interplanetary Database Association e.V.,
+# Planetmint 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
+
+cd planetmint
+
+# Remove build artifacts
+rm -fr build/
+rm -fr dist/
+rm -fr .eggs/
+find . -name '*.egg-info' -exec rm -fr {} +
+find . -name '*.egg' -type f -exec rm -f {} +
+
+# Remove Python file artifacts
+find . -name '*.pyc' -exec rm -f {} +
+find . -name '*.pyo' -exec rm -f {} +
+find . -name '*~' -exec rm -f {} +
+find . -name '__pycache__' -exec rm -fr {} +
+
+# Remove test and coverage artifacts
+find . -name '.pytest_cache' -exec rm -fr {} +
+rm -fr .tox/
+rm -f .coverage
+rm -fr htmlcov/

tests/test_config_utils.py

@@ -221,7 +221,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request):
         'tendermint': {
             'host': 'localhost',
             'port': 26657,
-            'version': 'v0.34.11'
+            'version': 'v0.34.15'
         },
         'log': {
             'file': LOG_FILE,