diff --git a/.travis.yml b/.travis.yml index 66144283..8418d6a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: install: - sudo apt-get update -q - sudo apt-get install intltool desktop-file-utils - - "pip3 install pytest-cov minimock pycodestyle 'isort<5.0' requests pytest pytest-httpserver" + - pip3 install pytest-cov minimock pycodestyle isort requests pytest pytest-httpserver - python3 tools/localdepends.py script: - make lint diff --git a/makefile b/makefile index dc15bc0e..fb596370 100644 --- a/makefile +++ b/makefile @@ -66,11 +66,10 @@ unittest: LC_ALL=C PYTHONPATH=src/ $(PYTEST) --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py LC_ALL=C PYTHONPATH=src/ $(PYTEST) tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder -# ISORTOPTS := -c share src/gpodder tools bin/* *.py # for isort >= 5.0 -ISORTOPTS := -rc -c share src/gpodder tools bin/* *.py +ISORTOPTS := -c share src/gpodder tools bin/* *.py lint: pycodestyle share src/gpodder tools bin/* *.py - isort -q $(ISORTOPTS) || isort -df $(ISORTOPTS) + isort -q $(ISORTOPTS) || isort --df $(ISORTOPTS) release: distclean diff --git a/setup.cfg b/setup.cfg index a9e0ed1d..c1af1bd4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,5 +5,5 @@ select = W1, W2, W3, E11, E121, E122, E123, E124, E125, E127, E129, E13, E2, E3, max-line-length = 142 [isort] -known_third_party=cairo,comtypes,dbus,gi,github3,jinja2,kaa,magic,mutagen,mygpoclient,podcastparser,requests,youtube_dl +known_third_party=dbus,gi,mutagen,cairo,requests,github3,jinja2,magic,youtube_dl,podcastparser,mygpoclient known_first_party=gpodder,soco