Quality: For files split with isort ensure newline for second part

SuperDisk · Sep 19, 2022 · e983f55 · e983f55
1 parent 1d807af
commit e983f55
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 3 deletions.
diff --git a/bin/autoformat-nuitka-source b/bin/autoformat-nuitka-source
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.quality.auto_format.__main__ import main
 
 main()
diff --git a/bin/check-nuitka-with-codespell b/bin/check-nuitka-with-codespell
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.quality.codespell.__main__ import main
 
 main()
diff --git a/bin/check-nuitka-with-pylint b/bin/check-nuitka-with-pylint
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.quality.pylint.__main__ import main
 
 main()
diff --git a/bin/check-nuitka-with-restlint b/bin/check-nuitka-with-restlint
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.quality.restlint.__main__ import main
 
 main()
diff --git a/bin/check-nuitka-with-yamllint b/bin/check-nuitka-with-yamllint
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.quality.yamllint.__main__ import main
 
 main()
diff --git a/bin/check-reference-counts b/bin/check-reference-counts
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.testing.check_reference_counts.__main__ import main
 
 main()
diff --git a/bin/compare_with_cpython b/bin/compare_with_cpython
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.testing.compare_with_cpython.__main__ import main
 
 main()
diff --git a/bin/find-module b/bin/find-module
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.general.find_module.__main__ import main
 
 main()
diff --git a/bin/find_sxs_modules b/bin/find_sxs_modules
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.testing.find_sxs_modules.__main__ import main
 
 main()
diff --git a/bin/generate-specialized-c-code b/bin/generate-specialized-c-code
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.specialize.SpecializeC import main
 
 main()
diff --git a/bin/generate-specialized-python-code b/bin/generate-specialized-python-code
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.specialize.SpecializePython import main
 
 main()
diff --git a/bin/measure-construct-performance b/bin/measure-construct-performance
@@ -29,6 +29,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 from nuitka.tools.testing.measure_construct_performance.__main__ import main
 
 main()
diff --git a/bin/nuitka b/bin/nuitka
@@ -31,6 +31,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 import nuitka.__main__  # false alarm, pylint: disable=I0021,no-name-in-module
 
 # Remove the nuitka package directory again, it might contain other stuff that we

diff --git a/bin/nuitka-run b/bin/nuitka-run
@@ -31,6 +31,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 import nuitka.__main__  # false alarm, pylint: disable=I0021,no-name-in-module
 
 # Remove the nuitka package directory again, it might contain other stuff that we

diff --git a/bin/nuitka3 b/bin/nuitka3
@@ -31,6 +31,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 import nuitka.__main__
 
 nuitka.__main__.main()
diff --git a/bin/nuitka3-run b/bin/nuitka3-run
@@ -31,6 +31,7 @@ import sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
 # isort:start
+
 import nuitka.__main__
 
 nuitka.__main__.main()
diff --git a/nuitka/tools/quality/auto_format/AutoFormat.py b/nuitka/tools/quality/auto_format/AutoFormat.py
@@ -303,7 +303,7 @@ def _cleanupImportSortOrder(filename):
     if start_index is not None:
         contents = getFileContents(filename)
 
-        contents = "\n".join(parts[: start_index + 1]) + "\n" + contents
+        contents = "\n".join(parts[: start_index + 1]) + "\n\n" + contents.lstrip("\n")
 
         putTextFileContents(filename, contents=contents)
 

diff --git a/nuitka/tools/quality/yamllint/__main__.py b/nuitka/tools/quality/yamllint/__main__.py
@@ -31,6 +31,7 @@
 )
 
 # isort:start
+
 from optparse import OptionParser
 
 from nuitka.tools.Basics import goHome

diff --git a/nuitka/tools/specialize/SpecializeC.py b/nuitka/tools/specialize/SpecializeC.py
@@ -25,7 +25,6 @@
 
 # isort:start
 
-
 import os
 
 import nuitka.specs.BuiltinBytesOperationSpecs

diff --git a/tests/onefile/run_all.py b/tests/onefile/run_all.py
@@ -42,6 +42,7 @@
 )
 
 # isort:start
+
 from nuitka.freezer.RuntimeTracing import getRuntimeTraceOfLoadedFiles
 from nuitka.tools.testing.Common import (
     addExtendedExtraOptions,

diff --git a/tests/optimizations/run_all.py b/tests/optimizations/run_all.py
@@ -48,6 +48,7 @@
 )
 
 # isort:start
+
 from nuitka.tools.testing.Common import (
     convertUsing2to3,
     createSearchMode,
@@ -61,7 +62,7 @@
 from nuitka.utils.Execution import check_call
 from nuitka.utils.FileOperations import getFileContents
 
-python_version = setup(suite="optimiations")
+python_version = setup(suite="optimizations")
 
 search_mode = createSearchMode()
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ @@
     )
     # isort:start
     from optparse import OptionParser
     from nuitka.tools.Basics import goHome
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,6 @@

		# isort:start


		import os

		import nuitka.specs.BuiltinBytesOperationSpecs
Expand Down