Skip to content

Commit 73586c4

Browse files
authored
Merge pull request #360 from flask-dashboard/development
Development
2 parents 0404b05 + d417693 commit 73586c4

File tree

205 files changed

+16711
-3075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+16711
-3075
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# exclude minified js from being counted as source code
2+
/flask_monitoringdashboard/static/* linguist-generated
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Upload Python Package
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up Python
15+
uses: actions/setup-python@v1
16+
with:
17+
python-version: '3.x'
18+
- name: Install dependencies
19+
run: |
20+
python -m pip install --upgrade pip
21+
pip install setuptools wheel twine
22+
- name: Build and publish
23+
env:
24+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
25+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
26+
run: |
27+
python setup.py sdist bdist_wheel
28+
twine upload dist/*

.github/workflows/python-test.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Continous Integration
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Set up Python ${{ matrix.python-version }}
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: ${{ matrix.python-version }}
19+
- name: Install dependencies
20+
run: |
21+
python -m pip install --upgrade pip
22+
pip install setuptools --upgrade
23+
pip install -r requirements-dev.txt
24+
- name: Lint with flake8
25+
run: |
26+
flake8 . --exit-zero --max-line-length=100 --ignore=F401,W503 --max-complexity=10 --max-line-length=100
27+
- name: Test with pytest
28+
run: |
29+
pytest --cov --cov-report=xml
30+
- name: Upload coverage to Codecov
31+
uses: codecov/codecov-action@v1
32+
with:
33+
file: ./coverage.xml

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ __pycache__/
99
# Distribution / packaging
1010
.Python
1111
env/
12+
.venv
1213
build/
1314
develop-eggs/
1415
dist/
@@ -103,3 +104,5 @@ ENV/
103104
# own scripts
104105
flask_monitoringdashboard/make_requests.py
105106
flask_monitoringdashboard/session_test.py
107+
frontend/node_modules/
108+
frontend/build/

.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
recursive-include flask_monitoringdashboard/static *
22
recursive-include flask_monitoringdashboard/templates *
3-
recursive-include flask_monitoringdashboard/test *
43
include requirements.txt
54
include README.md
65
include docs/changelog.rst

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ A dashboard for automatic monitoring of <a href="http://flask.pocoo.org/" target
1010
</p>
1111

1212
<span align="center">
13-
14-
[![Build Status](https://travis-ci.org/flask-dashboard/Flask-MonitoringDashboard.svg?branch=master)](https://travis-ci.org/flask-dashboard/Flask-MonitoringDashboard)
13+
14+
![Build Status](https://github.com/flask-dashboard/Flask-MonitoringDashboard/workflows/Python%20Testing/badge.svg)
1515
[![Documentation Status](https://readthedocs.org/projects/flask-monitoringdashboard/badge/?version=latest)](http://flask-monitoringdashboard.readthedocs.io/en/latest/?badge=latest)
1616
[![codecov](https://codecov.io/gh/flask-dashboard/Flask-MonitoringDashboard/branch/master/graph/badge.svg)](https://codecov.io/gh/flask-dashboard/Flask-MonitoringDashboard)
1717
[![PyPI version](https://badge.fury.io/py/Flask-MonitoringDashboard.svg)](https://badge.fury.io/py/Flask-MonitoringDashboard)

codecov.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
codecov:
2+
token: bda4fd4f-e8ae-4cdd-8b9a-3bb3a0932003
3+
4+
coverage:
5+
status:
6+
patch: off

config.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[dashboard]
22
APP_VERSION=1.0
33
GIT=/<path to your project>/.git/
4+
BLUEPRINT_NAME=dashboard
45
CUSTOM_LINK=dashboard
5-
MONITOR_LEVEL=3
6+
MONITOR_LEVEL=1
67
OUTLIER_DETECTION_CONSTANT=2.5
78

89
[authentication]

config/.pre-commit-config.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)