Revert "force isort < 5.0 until available in gentoo"

isort 5.7 is now available in gentoo

This reverts commit 2f6ad1760e.
This commit is contained in:
Eric Le Lay 2021-03-28 12:46:12 +02:00
parent c2d1ce7a35
commit 09f7dd4d5e
3 changed files with 4 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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