diff --git a/.gitattributes b/.gitattributes index efa180c..9897fc2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,4 +6,3 @@ tests/ export-ignore .pylintrc export-ignore Makefile export-ignore requirements.txt export-ignore -tox.ini export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 405cc33..287d643 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,6 @@ jobs: pip install -r requirements.txt - name: Run pylint run: make check-pylint - - name: Run tox - run: make check-tox - name: Check translations if: matrix.os == 'ubuntu-latest' run: make check-translations diff --git a/Makefile b/Makefile index 0bf6de5..8f0d3e5 100644 --- a/Makefile +++ b/Makefile @@ -21,16 +21,12 @@ languages = $(filter-out en_gb, $(patsubst resources/language/resource.language. all: check test build zip: build -check: check-pylint check-tox check-translations +check: check-pylint check-translations check-pylint: @printf ">>> Running pylint checks\n" @$(PYTHON) -m pylint *.py resources/lib/ tests/ -check-tox: - @printf ">>> Running tox checks\n" - @$(PYTHON) -m tox -q - check-translations: @printf ">>> Running translation checks\n" @$(foreach lang,$(languages), \ @@ -58,7 +54,7 @@ clean: @printf ">>> Cleaning up\n" @find . -name '*.py[cod]' -type f -delete @find . -name '__pycache__' -type d -delete - @rm -rf .pytest_cache/ .tox/ tests/cdm tests/userdata/temp + @rm -rf .pytest_cache/ tests/cdm tests/userdata/temp @rm -f *.log .coverage build: clean diff --git a/requirements.txt b/requirements.txt index dfdff7a..35cb6ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,5 @@ pytest python-dateutil requests git+git://github.com/dagwieers/kodi-plugin-routing.git@setup#egg=routing -tox six sakee diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 3c84f98..0000000 --- a/tox.ini +++ /dev/null @@ -1,27 +0,0 @@ -[tox] -envlist = py27,py36,py37,py38,py39,flake8 -skipsdist = True -skip_missing_interpreters = True - -[testenv:flake8] -commands = - - {envbindir}/flake8 -deps = - flake8 - flake8-coding - flake8-future-import - -[flake8] -builtins = func -max-line-length = 160 -ignore = FI13,FI50,FI51,FI53,FI54,W503 -require-code = True -min-version = 2.7 -exclude = .git,.tox - -[pytest] -filterwarnings = default - -[pycodestyle] -max-line-length = 160 -