From: Shane <30691680+gamesguru@users.noreply.github.com>
Date: Tue, 9 Sep 2025 16:32:54 +0000 (-0400)
Subject: isort & black agree
X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=78f1f387b1004f7d1d62553e1bd42cd53086fbe8;p=gamesguru%2Fgetmyancestors.git

isort & black agree
---

diff --git a/.pylintrc b/.pylintrc
index 1990f74..3ae702d 100644
--- 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 d167625..79cadbe 100644
--- 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 aa6e36a..0848766 100644
--- 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 421bd59..49813a0 100644
--- 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 2556747..a57ff57 100644
--- 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