isort & black agree

diff --git a/.pylintrc b/.pylintrc
index 1990f74dac668a7de9dba8de9b7f13ee52cfa22b..3ae702d71c6d8dfcf3eaf06e0709327f5eefe3c1 100644 (file)
--- a/.pylintrc
+++ b/.pylintrc
@@ -10,6 +10,7 @@ disable=
     consider-using-f-string,
     missing-module-docstring,
     missing-function-docstring,
+    duplicate-code,
     too-many-arguments,
     too-many-positional-arguments,
     too-many-instance-attributes,

diff --git a/Makefile b/Makefile
index d1676250f1c7a441348b133bab680c1ed6547d0d..79cadbea11414bba3cf68380e6208b5c287cbdc7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ LINT_LOCS ?= getmyancestors/
 
 .PHONY: lint
 lint:
+       -flake8 $(LINT_LOCS)
        black $(LINT_LOCS)
        isort $(LINT_LOCS)
-       flake8 $(LINT_LOCS)
+       pylint $(LINT_LOCS)

diff --git a/getmyancestors/getmyancestors.py b/getmyancestors/getmyancestors.py
index aa6e36a5f20f9533b448ca19626f9105cd75846b..08487669a24a615f417e4b30e78876d07a0b90b5 100644 (file)
--- a/getmyancestors/getmyancestors.py
+++ b/getmyancestors/getmyancestors.py
@@ -1,6 +1,5 @@
 # coding: utf-8
 
-# global imports
 from __future__ import print_function
 
 import argparse
@@ -11,8 +10,8 @@ import sys
 import time
 from urllib.parse import unquote
 
-from getmyancestors.classes.session import Session
 # local imports
+from getmyancestors.classes.session import Session
 from getmyancestors.classes.tree import Tree
 
 

diff --git a/getmyancestors/mergemyancestors.py b/getmyancestors/mergemyancestors.py
index 421bd590cfedffac57fc42dc34ab82e8ce96569b..49813a0f51b43161cd107c37ad46722d2db1325d 100644 (file)
--- a/getmyancestors/mergemyancestors.py
+++ b/getmyancestors/mergemyancestors.py
@@ -3,12 +3,11 @@
 from __future__ import print_function
 
 import argparse
-# global imports
 import os
 import sys
 
-from getmyancestors.classes.gedcom import Gedcom
 # local imports
+from getmyancestors.classes.gedcom import Gedcom
 from getmyancestors.classes.tree import Fam, Indi, Tree
 
 sys.path.append(os.path.dirname(sys.argv[0]))

diff --git a/setup.cfg b/setup.cfg
index 2556747d8f3d46d59f406f124fd3d50c5951ed8a..a57ff573772f5a27a7151dcbe60adb14c6267c2c 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,7 +46,7 @@ ignore =
 
 [isort]
 line_length = 88
-known_first_party = ntclient
+known_first_party = getmyancestors
 
 # See: https://copdips.com/2020/04/making-isort-compatible-with-black.html
 multi_line_output = 3