Merge branch 'develop'

.travis.yml

@@ -0,0 +1,21 @@
+dist: trusty
+language: python
+sudo: false
+python:
+  - 3.5
+matrix:
+  include:
+    - env: TOXENV=py35
+      python: 3.5
+    - env: TOXENV=py36
+      python: 3.6
+    #- env: TOXENV=py37
+    #  python: 3.7
+install:
+  - pip install tox-travis codecov
+script:
+  - tox
+    #- sed -i 's/filename="/filename=".\//g' coverage.xml
+    #- ( which sonar-scanner && sonar-scanner || true )
+after_success:
+  - codecov

README.md

@@ -1,6 +1,7 @@
 # Flask-Beet Extension
 
 [![build status](https://secure.travis-ci.org/blockchainprojects/flask_beet.png?branch=master)](https://travis-ci.org/#!/blockchainprojects/flask_beet)
+[![codecov](https://codecov.io/gh/blockchainprojects/flask_beet/branch/master/graph/badge.svg)](https://codecov.io/gh/blockchainprojects/flask_beet)
 
 Flask-beet is a Flask extension for allow login (flask-security/flask-login)
 via signed messages and the [Beet app](http://get-beet.io).

setup.cfg

@@ -6,14 +6,14 @@ test=pytest
 
 [coverage:run]
 source=flask_beet
-branch=True
+branch = 1
 omit=
    tests/*
    .tox/*
    .eggs/*
 
 [coverage:report]
-include=bitshares*
+include=flask_beet*
 ignore_errors=True
 show_missing=True
 exclude_lines =

setup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from setuptools import setup
 
 setup(
@@ -23,4 +24,6 @@
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
+    setup_requires=["pytest-runner"],
+    tests_require=["pytest"],
 )

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = py35,py36,py37,lint,docs
-#envlist = py36,lint,docs
+#envlist = py35,py36,py37,lint,docs
+envlist = py36,lint,docs
 skip_missing_interpreters = true
 
 [testenv]
@@ -12,15 +12,16 @@ commands=
     coverage xml -i
 
 [testenv:lint]
-deps =
-    flake8
-    black
-    isort
+deps = flake8
+
+#    black
+#    isort
 
 commands =
     flake8 flask_beet
-    black --check --verbose flask_beet
-    isort --check-only --recursive flask_beet
+
+#black --check --verbose flask_beet
+#isort --check-only --recursive flask_beet
 
 [testenv:docs]
 basepython=