From 8b7659c4d3d58b1446d0b6b368858998626e30da Mon Sep 17 00:00:00 2001 From: Andris Raugulis Date: Sat, 25 Mar 2017 08:02:49 +0200 Subject: [PATCH] Remove unnecessary files, now that everything is in tox. Add codecov badge. --- .gitignore | 1 + README.md | 1 + test/coverage.sh | 10 ---------- test/mypy-py2.sh | 15 -------------- test/mypy-py3.sh | 14 ------------- test/mypy.ini | 13 ------------ test/prospector.sh | 13 ------------ test/prospector.yml | 42 --------------------------------------- test/requirements-py2.txt | 5 ----- test/requirements-py3.txt | 6 ------ 10 files changed, 2 insertions(+), 118 deletions(-) delete mode 100755 test/coverage.sh delete mode 100755 test/mypy-py2.sh delete mode 100755 test/mypy-py3.sh delete mode 100644 test/mypy.ini delete mode 100755 test/prospector.sh delete mode 100644 test/prospector.yml delete mode 100644 test/requirements-py2.txt delete mode 100644 test/requirements-py3.txt diff --git a/.gitignore b/.gitignore index 8a442a4..0edf4f4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ venv/ .cache/ .tox .coverage +coverage.xml diff --git a/README.md b/README.md index e9f8f13..c78d779 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # ssh-audit [![build status](https://api.travis-ci.org/arthepsy/ssh-audit.svg)](https://travis-ci.org/arthepsy/ssh-audit) +[![codecov](https://codecov.io/gh/arthepsy/ssh-audit/branch/develop/graph/badge.svg)](https://codecov.io/gh/arthepsy/ssh-audit) [![coverage status](https://coveralls.io/repos/github/arthepsy/ssh-audit/badge.svg)](https://coveralls.io/github/arthepsy/ssh-audit) **ssh-audit** is a tool for ssh server auditing. diff --git a/test/coverage.sh b/test/coverage.sh deleted file mode 100755 index 28f2010..0000000 --- a/test/coverage.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -_cdir=$(cd -- "$(dirname "$0")" && pwd) -type py.test > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "err: py.test (Python testing framework) not found." - exit 1 -fi -cd -- "${_cdir}/.." -mkdir -p html -py.test -v --cov-report=html:html/coverage --cov=ssh-audit test diff --git a/test/mypy-py2.sh b/test/mypy-py2.sh deleted file mode 100755 index 17ba99e..0000000 --- a/test/mypy-py2.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -_cdir=$(cd -- "$(dirname "$0")" && pwd) -type mypy > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "err: mypy (Optional Static Typing for Python) not found." - exit 1 -fi -_htmldir="${_cdir}/../html/mypy-py2" -mkdir -p "${_htmldir}" -env MYPYPATH="${_cdir}/stubs/" mypy \ ---python-version 2.7 \ ---no-warn-incomplete-stub \ ---show-error-context \ ---config-file "${_cdir}/mypy.ini" \ ---html-report "${_htmldir}" "${_cdir}/../ssh-audit.py" diff --git a/test/mypy-py3.sh b/test/mypy-py3.sh deleted file mode 100755 index 81f2421..0000000 --- a/test/mypy-py3.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -_cdir=$(cd -- "$(dirname "$0")" && pwd) -type mypy > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "err: mypy (Optional Static Typing for Python) not found." - exit 1 -fi -_htmldir="${_cdir}/../html/mypy-py3" -mkdir -p "${_htmldir}" -env MYPYPATH="${_cdir}/stubs/" mypy \ ---python-version 3.5 \ ---show-error-context \ ---config-file "${_cdir}/mypy.ini" \ ---html-report "${_htmldir}" "${_cdir}/../ssh-audit.py" diff --git a/test/mypy.ini b/test/mypy.ini deleted file mode 100644 index 128ac30..0000000 --- a/test/mypy.ini +++ /dev/null @@ -1,13 +0,0 @@ -[mypy] -ignore_missing_imports = False -follow_imports = error -disallow_untyped_calls = True -disallow_untyped_defs = True -check_untyped_defs = True -disallow_subclassing_any = True -warn_incomplete_stub = True -warn_redundant_casts = True -warn_return_any = True -warn_unused_ignores = True -strict_optional = True -#strict_boolean = False diff --git a/test/prospector.sh b/test/prospector.sh deleted file mode 100755 index 4398ec7..0000000 --- a/test/prospector.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -_cdir=$(cd -- "$(dirname "$0")" && pwd) -type prospector > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "err: prospector (Python Static Analysis) not found." - exit 1 -fi -if [ X"$1" == X"" ]; then - _file="${_cdir}/../ssh-audit.py" -else - _file="$1" -fi -prospector -E --profile-path "${_cdir}" -P prospector "${_file}" diff --git a/test/prospector.yml b/test/prospector.yml deleted file mode 100644 index 474af15..0000000 --- a/test/prospector.yml +++ /dev/null @@ -1,42 +0,0 @@ -strictness: veryhigh -doc-warnings: false - -pylint: - disable: - - multiple-imports - - invalid-name - - trailing-whitespace - - options: - max-args: 8 # default: 5 - max-locals: 20 # default: 15 - max-returns: 6 - max-branches: 15 # default: 12 - max-statements: 60 # default: 50 - max-parents: 7 - max-attributes: 8 # default: 7 - min-public-methods: 1 # default: 2 - max-public-methods: 20 - max-bool-expr: 5 - max-nested-blocks: 6 # default: 5 - max-line-length: 80 # default: 100 - ignore-long-lines: ^\s*(#\s+type:\s+.*|[A-Z0-9_]+\s+=\s+.*|('.*':\s+)?\[.*\],?)$ - max-module-lines: 2500 # default: 10000 - -pep8: - disable: - - W191 # indentation contains tabs - - W293 # blank line contains whitespace - - E101 # indentation contains mixed spaces and tabs - - E401 # multiple imports on one line - - E501 # line too long - - E221 # multiple spaces before operator - -pyflakes: - disable: - - F401 # module imported but unused - - F821 # undefined name - -mccabe: - options: - max-complexity: 15 diff --git a/test/requirements-py2.txt b/test/requirements-py2.txt deleted file mode 100644 index bd50c11..0000000 --- a/test/requirements-py2.txt +++ /dev/null @@ -1,5 +0,0 @@ -pytest==3.0.7 -pytest-cov==2.4.0 -lxml==3.7.3 -colorama==0.3.7 -prospector==0.12.4 diff --git a/test/requirements-py3.txt b/test/requirements-py3.txt deleted file mode 100644 index 9957de7..0000000 --- a/test/requirements-py3.txt +++ /dev/null @@ -1,6 +0,0 @@ -pytest==3.0.7 -pytest-cov==2.4.0 -mypy==0.501 -lxml==3.7.3 -colorama==0.3.7 -prospector==0.12.4