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:
parent
c2d1ce7a35
commit
09f7dd4d5e
|
@ -6,7 +6,7 @@ python:
|
||||||
install:
|
install:
|
||||||
- sudo apt-get update -q
|
- sudo apt-get update -q
|
||||||
- sudo apt-get install intltool desktop-file-utils
|
- 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
|
- python3 tools/localdepends.py
|
||||||
script:
|
script:
|
||||||
- make lint
|
- make lint
|
||||||
|
|
5
makefile
5
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) --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
|
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 := -c share src/gpodder tools bin/* *.py
|
||||||
ISORTOPTS := -rc -c share src/gpodder tools bin/* *.py
|
|
||||||
lint:
|
lint:
|
||||||
pycodestyle share src/gpodder tools bin/* *.py
|
pycodestyle share src/gpodder tools bin/* *.py
|
||||||
isort -q $(ISORTOPTS) || isort -df $(ISORTOPTS)
|
isort -q $(ISORTOPTS) || isort --df $(ISORTOPTS)
|
||||||
|
|
||||||
|
|
||||||
release: distclean
|
release: distclean
|
||||||
|
|
|
@ -5,5 +5,5 @@ select = W1, W2, W3, E11, E121, E122, E123, E124, E125, E127, E129, E13, E2, E3,
|
||||||
max-line-length = 142
|
max-line-length = 142
|
||||||
|
|
||||||
[isort]
|
[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
|
known_first_party=gpodder,soco
|
||||||
|
|
Loading…
Reference in New Issue